Merge remote-tracking branch 'fstirlitz/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Fri, 12 Dec 2014 19:17:26 +0000 (20:17 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Fri, 12 Dec 2014 19:17:26 +0000 (20:17 +0100)
commit46d9760f5ebd86ee5b34fd669f44b124f34fffc1
treed1eb83b73893f6a6cb7756b8608763c757a5e498
parent90d71d3f088bbb787795aa6018eda21e2a821e7d
parentdc65a213fd73a385470fe1d8f7ad48a174d11bd4
Merge remote-tracking branch 'fstirlitz/master'