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)
commit3c937e95a965d8dd047ccc55daa65c233d0cb631
treebd5cb0cbbcd840c906acadfb8b59f15f6770487d
parentd1194503f96bf038a644014230289a9ccfb7ba07
parente5ca5012aa3c7cfe4aba863a331556f416121a05
Merge remote-tracking branch 'origin/develop' into develop