Merge remote-tracking branch 'origin/master'
authorKenneth Reitz <me@kennethreitz.com>
Sun, 2 Dec 2012 09:09:05 +0000 (10:09 +0100)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 2 Dec 2012 09:09:05 +0000 (10:09 +0100)
commit3b5d580409271dd0c4935ebf39ff2d8e00dc799d
tree6fca9932dd7df8621290c18880a6042da1b9863f
parentad311497fa100a7f4b11ca3df9c7a84b6084602e
parent33eb76f958e0024ab6a206407e8c8d104c095e9d
Merge remote-tracking branch 'origin/master'