Merge remote-tracking branch 'origin/develop' into develop
authordeclerambaul <fabian.kaelin@gmail.com>
Thu, 7 Jun 2012 13:51:32 +0000 (15:51 +0200)
committerdeclerambaul <fabian.kaelin@gmail.com>
Thu, 7 Jun 2012 13:51:32 +0000 (15:51 +0200)
commitdb2e782e68a7277f7929433d39bd8995b7133bb0
treee1af75ca44e04c64088b245ce342347c19113304
parent0e4393444d8c4de629c4c9c5d44f7dd957efc973
parent9a3c34ab5c6ee8ff160a9010527efdc9c9bb3039
Merge remote-tracking branch 'origin/develop' into develop