Merge branch 'master' into branch-1.5
authorBdale Garbee <bdale@gag.com>
Wed, 10 Sep 2014 07:32:27 +0000 (01:32 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 10 Sep 2014 07:32:27 +0000 (01:32 -0600)
commit05e4094411f861bf29bea2e9c39c1b66f8f267f8
tree0e1037212fb440b1f8beb3288a0a9e8ee8a452ac
parentacb279125c0fa377c8b1dbbb8634fba60f7f845b
parent2ee937b603b181bb24768eb4d0e2f918a5377fd3
Merge branch 'master' into branch-1.5
configure.ac