Merge branch 'master' into branch-1.5
authorBdale Garbee <bdale@gag.com>
Wed, 10 Sep 2014 06:01:33 +0000 (00:01 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 10 Sep 2014 06:01:33 +0000 (00:01 -0600)
commitb3fba989a84db7d904e09a8f47e3a86d4e0f9577
treec010c115559912053104d626ff5d2409117401d7
parent28bd5057252e61bc5b1a35a00bc1f9fdfde097f7
parent1fb200d18cc385230b3af574816ec354682cc5c9
Merge branch 'master' into branch-1.5