Merge branch 'v2.0' 09/1809/1
authorroot <root@SO-ub.lxd>
Thu, 11 May 2017 14:18:41 +0000 (14:18 +0000)
committerroot <root@SO-ub.lxd>
Thu, 11 May 2017 14:18:41 +0000 (14:18 +0000)
commit2ff1adf2b9a42c3e70884ab57c48bd19de569f85
tree64421565ec666ec637bb22f3f60d909147c2f07d
parent89a847105dec647e2de5dafb2b4569e54ee5dbfd
parenta9e3739bc09c63a8853036d31f4574ec54f4eb7d
Merge branch 'v2.0'