Merge branch 'develop'
authorKenneth Reitz <me@kennethreitz.com>
Wed, 14 Dec 2011 15:43:41 +0000 (10:43 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Wed, 14 Dec 2011 15:43:41 +0000 (10:43 -0500)
commit19a2a6c6d13bce4c89ad56ae00e56f49e351e5e5
tree6fcd3313e4c9f7009375cb42ebfc57720bf4603f
parent8c1fd5db95e7b79ee60da8f9c3b3e508be69e3fa
parent0e711f2f9d6b4ae13091d00ca4e04f6114159149
Merge branch 'develop'