Merge branch 'v0.11.9-release'
authorTimothy J Fontaine <tjfontaine@gmail.com>
Thu, 21 Nov 2013 00:40:36 +0000 (16:40 -0800)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Thu, 21 Nov 2013 00:40:36 +0000 (16:40 -0800)

Trivial merge