Merge remote-tracking branch 'origin/master'
authorKenneth Reitz <me@kennethreitz.com>
Sat, 28 Jul 2012 21:09:21 +0000 (17:09 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 28 Jul 2012 21:09:21 +0000 (17:09 -0400)
commitbc110a2163d5cdc6576cca7b0eaaa6e72b4bef26
treea16324810eb2f8465754b896ff76edcae2d31123
parentccea69feb0009e56d7d70e6068ff2f68f328c65e
parentdc3af98a388a47ada7bbbbb5baabc2d34b303386
Merge remote-tracking branch 'origin/master'