Merge branch 'v0.11.7-release'
authorTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 4 Sep 2013 22:18:09 +0000 (15:18 -0700)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 4 Sep 2013 22:18:09 +0000 (15:18 -0700)

Trivial merge