Merge remote-tracking branch 'ossi96/bpb'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 24 Nov 2014 21:42:56 +0000 (22:42 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 24 Nov 2014 21:42:56 +0000 (22:42 +0100)

Trivial merge