Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 23 Aug 2014 23:34:28 +0000 (01:34 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 23 Aug 2014 23:34:28 +0000 (01:34 +0200)
commit30b871b0ca09ae6088d8a8a0f77bf4d25aa0cb5b
tree5f7ebe4a1029794fe8f3217bb52ebb958b54427c
parenteb9da9b732c63309e8592729d3e048953086a308
parenta54bda3ae2d659c9020668a638dccc3545a1ecb1
Merge remote-tracking branch 'origin/master'