Merge branch 'master' of linz:/srv/git/lantea
authorRobert Kaiser <kairo@kairo.at>
Fri, 10 Nov 2017 20:19:23 +0000 (21:19 +0100)
committerRobert Kaiser <kairo@kairo.at>
Fri, 10 Nov 2017 20:19:23 +0000 (21:19 +0100)
commita1565de42b662fbe8565825aaf2e5619fbb29ac0
tree7e0b6a3cd89d81ed061307cbd9b4dcbb439c1876
parent726dc90f430427523c554383267c8f336934fc3b
parent1c056e7aecb2121a68f411ccc7e32039ebb63118
Merge branch 'master' of linz:/srv/git/lantea