Merge remote-tracking branch 'upstream/develop' into develop
authorJérémy Bethmont <jeremy.bethmont@gmail.com>
Wed, 17 Aug 2011 08:07:43 +0000 (10:07 +0200)
committerJérémy Bethmont <jeremy.bethmont@gmail.com>
Wed, 17 Aug 2011 08:07:43 +0000 (10:07 +0200)
commitfe109b27be1fcafee5d33924d9b84f47ba173264
tree8d2c550501228cd2a16a37baa40ff6ff1fe88cfb
parente1909375f595d06d540bf93baa93a782f5cea239
parentd4502aff8751bbb82e74974c8f6423865d1d210a
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
requests/models.py
requests/models.py