Merge branch 'v0.9.5-release'
authorisaacs <i@izs.me>
Sun, 30 Dec 2012 01:25:25 +0000 (17:25 -0800)
committerisaacs <i@izs.me>
Sun, 30 Dec 2012 01:25:25 +0000 (17:25 -0800)

Trivial merge