Merge branch 'master' into stable master-stable-switch
authorHenning Rogge <hrogge@googlemail.com>
Wed, 15 Aug 2012 16:00:55 +0000 (18:00 +0200)
committerHenning Rogge <hrogge@googlemail.com>
Wed, 15 Aug 2012 16:00:55 +0000 (18:00 +0200)
commit6e17820570b8d5245de624cca94fff5fbb5b7fc2
treed2d42efa770296fa5483f3c6268d92db2d473da5
parent67232d268aa9c9322d7a811e1b1849800c47a881
parentefc6a346bcd801d5d45b63e014d8694e5de284ee
Merge branch 'master' into stable