Merge branch 'master' into stable.
authorDavid Thompson <davet@gnu.org>
Thu, 18 Sep 2014 14:29:34 +0000 (10:29 -0400)
committerDavid Thompson <davet@gnu.org>
Thu, 18 Sep 2014 14:29:34 +0000 (10:29 -0400)
commit04e0e7bc6712f5d48a896b2211db5340132eb9b1
tree92aae456e0ae44b3809cede885441413bbb9f520
parent7d7f80cb661adeb7e2d3b8b3a61c3b34b657dd0e
parentca13deb6622e0a9c4c1634b3f8b1061e313f7a7f
Merge branch 'master' into stable.