Merge branch 'master' of git@gitlab.com:yargo/ambros.git
commit535cf1f0a00fd46129fef4f3bcf6378cb786b703
authorroot <root@localhost>
Mon, 17 Aug 2015 18:06:44 +0000 (17 20:06 +0200)
committerroot <root@localhost>
Mon, 17 Aug 2015 18:06:44 +0000 (17 20:06 +0200)
treeed8d9616711d3647f05104d229095d2e905d8adb
parent809ef0748bfa3dea148890e2a712d9d584013471
parent43e2aff2ec0d61d0c1e029aa8587640a37da2fe9
Merge branch 'master' of git@gitlab.com:yargo/ambros.git