Merge branch 'v0.10.17-release' into v0.10
authorTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 21 Aug 2013 23:37:31 +0000 (16:37 -0700)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 21 Aug 2013 23:37:31 +0000 (16:37 -0700)
commitfcf180327b95328dd25c64b8301cbf0c430530cd
treecb9a46762b5c7ed2b608cfa4cdba72a38ef82f17
parente445fbda1f76ee87141c7320f31f29a8a9a1729f
parent469a4a5091a677df62be319675056b869c31b35c
Merge branch 'v0.10.17-release' into v0.10