Merge branch 'florianbeer-patch-1'
authorSebastian Wagner <sebix@sebix.at>
Tue, 13 Dec 2016 17:54:02 +0000 (18:54 +0100)
committerSebastian Wagner <sebix@sebix.at>
Tue, 13 Dec 2016 17:54:02 +0000 (18:54 +0100)
commit042927d0e8d474ddcfb87eea1715f1dba84cdc20
treec2ed1499372be5241f92cdc869984445653493b4
parent5a5be4794e8db3b43ddc6d9fea8eaaddfb7821e8
parentafc2bddc67f9fc45cb20ec3ba7ec0621810e0135
Merge branch 'florianbeer-patch-1'