Merge branch 'v0.10.13-release' into v0.10
authorTimothy J Fontaine <tjfontaine@gmail.com>
Tue, 9 Jul 2013 21:28:05 +0000 (14:28 -0700)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Tue, 9 Jul 2013 21:28:05 +0000 (14:28 -0700)

Trivial merge