Merge branch 'v0.11.6-release'
authorTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 21 Aug 2013 21:16:29 +0000 (14:16 -0700)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 21 Aug 2013 21:16:29 +0000 (14:16 -0700)
commit51336a44bb990f2398aa88ea47c3c33f49f70883
tree1b44c0e0f7b6be0d0c3d880904460e2592526cd6
parenta784abaff631449533d44846987c1537c080e03d
parent04018d4b3938fd30ba14822e79195e4af2be36f6
Merge branch 'v0.11.6-release'