From: tilly-Q <nattilypigeonfowl@gmail.com>
Date: Mon, 21 Apr 2014 16:17:39 +0000 (-0400)
Subject: Merge branch 'metadata' of gitorious.org:mediagoblin/npigeons-mediagoblin into metadata
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=77a19712c390e5f7b2beb09314f8b4f2c2eaa794;p=mediagoblin.git

Merge branch 'metadata' of gitorious.org:mediagoblin/npigeons-mediagoblin into metadata

Conflicts:
	mediagoblin/gmg_commands/batchaddmedia.py
	setup.py
---

77a19712c390e5f7b2beb09314f8b4f2c2eaa794
diff --cc setup.py
index 15fd913c,12739ffd..0716e45f
--- a/setup.py
+++ b/setup.py
@@@ -70,11 -67,7 +70,12 @@@ try
          'oauthlib==0.5.0',
          'unidecode',
          'jsonschema',
+         'requests',
 +        'ExifRead',
 +
 +        # PLEASE change this when we can; a dependency is forcing us to set this
 +        # specific number and it is breaking setup.py develop
 +        'six==1.5.2'
  
          ## Annoying.  Please remove once we can!  We only indirectly
          ## use pbr, and currently it breaks things, presumably till