Merge branch 'master' into branch-1.6
authorBdale Garbee <bdale@gag.com>
Thu, 16 Jul 2015 19:31:42 +0000 (13:31 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 16 Jul 2015 19:31:42 +0000 (13:31 -0600)
commit6e9bb9178356620bd47d9f2e31abf42b7f1a8f11
tree6f04b5500462d1f6e26ebcba58c5e9cd56afd442
parente2cefd8593d269ce603aaf33f4a53a5c2dcb3350
parent87c8bb3956897830da1f7aaca2990a9571767b73
Merge branch 'master' into branch-1.6