Merge branch 'smtbmc-kmanfi'
authorClifford Wolf <clifford@clifford.at>
Fri, 2 Sep 2016 11:55:51 +0000 (13:55 +0200)
committerClifford Wolf <clifford@clifford.at>
Fri, 2 Sep 2016 11:55:51 +0000 (13:55 +0200)
commitd2eba7631ff8bfb897db72f787ca365003176ca1
treea92a035176090941205a653bbe3b93c50073f2e8
parent2ee9bf10d029396ba03b1d3023f15ff585e26bcb
parent068d5bc02ffea9ba627bbf7151fdb36500eae0f2
Merge branch 'smtbmc-kmanfi'