Merge remote-tracking branch 'upstream/v0.10'
authorTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 1 Jan 2014 00:28:49 +0000 (16:28 -0800)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 1 Jan 2014 00:28:49 +0000 (16:28 -0800)
commit13eb17f4127469f93db4f248e81e92c87c5b5f58
tree213eb6838555a1b4190ac9c3a4054e8d44eccc36
parentc3e26d64f89537ae7d1741ef49a9c8ec86f15d01
parentaa56d9d35405a56b8478c0a83106ffa4ada903db
Merge remote-tracking branch 'upstream/v0.10'