Merge branch 'develop' into remoting-4.0
authorCherian Mathew <c.mathew@bgbm.org>
Tue, 15 Sep 2015 15:37:43 +0000 (17:37 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Tue, 15 Sep 2015 15:37:43 +0000 (17:37 +0200)
commit5c0de6cccab509d4f7c4dd88e112e3c24379e812
treef5eb7d2278725f52cdd3e8c28ca48699093d8b74
parentab6d805e80537bd04d97e24ac78d8d96e26923f9
parent8175c7f6a51901e6d67e4e6ca4d777df938de3a1
Merge branch 'develop' into remoting-4.0