Merge remote-tracking branch 'upstream-rw/v0.10'
authorTimothy J Fontaine <tjfontaine@gmail.com>
Tue, 17 Jun 2014 00:20:45 +0000 (19:20 -0500)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Tue, 17 Jun 2014 00:20:45 +0000 (19:20 -0500)
1  2 
ChangeLog

diff --cc ChangeLog
Simple merge