Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <me@kennethreitz.com>
Sat, 21 Jan 2012 22:48:55 +0000 (17:48 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 21 Jan 2012 22:48:55 +0000 (17:48 -0500)
commit2c04f9d1996e66015923448fa0230736eff472f0
treef85bd43ab63c5633cbdd09de13985e3e0636ca71
parent70e98e47cfd9c14dc967fdbfe690444166ff172e
parentb525dc29f706a29de5cde6282a72e3a6e981d41b
Merge remote-tracking branch 'origin/develop' into develop