Merge remote-tracking branch 'rzhxeo/blip2'
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 5 Jan 2014 02:16:19 +0000 (03:16 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 5 Jan 2014 02:16:19 +0000 (03:16 +0100)

Trivial merge