Merge branch 'master' into martin-t/msnt
authorMartin Taibr <taibr.martin@gmail.com>
Fri, 28 Oct 2016 18:58:49 +0000 (20:58 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Fri, 28 Oct 2016 18:58:49 +0000 (20:58 +0200)
commite1bfe1d1d43ac7adedba945d692b37e0aafc453b
tree48d63069762d02d2c9b2a568aeae0e758e9c9879
parentb8010438ca85aeb081045aaa0cf494b98457b0b0
parentf25d8b1740f6d6a093ea537b9f1091bd68068c17
Merge branch 'master' into martin-t/msnt