Merge branch 'v0.10.25-release' into v0.10
authorTimothy J Fontaine <tjfontaine@gmail.com>
Thu, 23 Jan 2014 19:44:14 +0000 (11:44 -0800)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Thu, 23 Jan 2014 19:44:14 +0000 (11:44 -0800)
commit24d05f21be4412e70e6ed490fb8009de0c9dfb55
tree8fd90af89684ce58f5711ee64f1b89eeaeec0934
parent8b7ec733317a2cbee4916362f8f0fc11f604c441
parentb0e5f195dfce3e2b99f5091373d49f6616682596
Merge branch 'v0.10.25-release' into v0.10