Merge branch 'v0.10.18-release' into v0.10
authorTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 4 Sep 2013 18:25:04 +0000 (11:25 -0700)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 4 Sep 2013 18:25:04 +0000 (11:25 -0700)
commit86d881f888fe1a92dc52b346771e5b9ee5c4ed5e
treee72f54d17aa052c5a6953294740128d39a3a8045
parent95794641d2e3f37b7f7559ed7fd3e04a596c3295
parent67a1f0c52e0708e2596f3f2134b8386d6112561e
Merge branch 'v0.10.18-release' into v0.10