Merge remote-tracking branch 'Elbandi/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 14 Oct 2013 23:26:34 +0000 (01:26 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 14 Oct 2013 23:26:34 +0000 (01:26 +0200)
commit3ddf1a6d01f73ca5a1c8320a5e0f51b9ab976e8c
tree436b15fe0827a3dcc678f4984bdbb91c6394b84e
parent850555c4843f7815030d015ec7df798332e60582
parentf9b3d7af471909a449c3bf5977a7aaa6555a3495
Merge remote-tracking branch 'Elbandi/master'