Merge branch 'v2.0' 18/1818/1
authorroot <root@SO-ub.lxd>
Fri, 12 May 2017 14:52:31 +0000 (14:52 +0000)
committerroot <root@SO-ub.lxd>
Fri, 12 May 2017 14:52:31 +0000 (14:52 +0000)
commit43ed27435ffec8370493513400a990bc1541f584
treec7a149729c0a566d1b2f607dc6eee7d9b18cc801
parent2ff1adf2b9a42c3e70884ab57c48bd19de569f85
parentaab510c77c18c7ac9e788ed50994e95bcab19d95
Merge branch 'v2.0'