Merge remote-tracking branch 'origin/develop' into develop
authordeclerambaul <fabian.kaelin@gmail.com>
Mon, 2 Jul 2012 13:55:28 +0000 (15:55 +0200)
committerdeclerambaul <fabian.kaelin@gmail.com>
Mon, 2 Jul 2012 13:55:28 +0000 (15:55 +0200)
commit61627d2507645634eb6d68c6cd11db916c558af2
tree16e4a3560b52ebfab2df7ddbf46b051af97c8174
parentcac22478bac5c1f4dd7351cc22b068e0f0e11bf4
parent5809496e42baaf4180607481ca51d608474d7790
Merge remote-tracking branch 'origin/develop' into develop