Merge branch 'master' into branch-1.6
authorBdale Garbee <bdale@gag.com>
Sun, 16 Aug 2015 15:53:40 +0000 (17:53 +0200)
committerBdale Garbee <bdale@gag.com>
Sun, 16 Aug 2015 15:53:40 +0000 (17:53 +0200)
commit489d22f448d9927533e90da4d16c5a332a234a8d
tree2e80701db3d8cecc12aedaecda8b35bb429c044a
parent570daace9caf7647a09c53d5c75593cc4c98b93b
parenteaab49ab1859ebe236a201f93b5352e67aa7ed2b
Merge branch 'master' into branch-1.6