Merge branch 'master' into branch-1.5
authorBdale Garbee <bdale@gag.com>
Wed, 10 Sep 2014 06:02:57 +0000 (00:02 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 10 Sep 2014 06:02:57 +0000 (00:02 -0600)
commit5de00e9e39cff2d3b409c2ce99caa994f0a36202
treedb20dc01d92ea0c0624ff04fdf506c1d7d8548ba
parentb3fba989a84db7d904e09a8f47e3a86d4e0f9577
parenta72b7683606d3e741043011c929482a0a168a5c9
Merge branch 'master' into branch-1.5