Merge branch 'v0.10.29-release' into v0.10
authorTimothy J Fontaine <tjfontaine@gmail.com>
Mon, 9 Jun 2014 17:51:53 +0000 (10:51 -0700)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Mon, 9 Jun 2014 17:51:53 +0000 (10:51 -0700)

Trivial merge