Merge branch 'release-0.10'
authorAndrew Ruthven <puck@catalyst.net.nz>
Sun, 11 Jan 2015 02:25:41 +0000 (15:25 +1300)
committerAndrew Ruthven <puck@catalyst.net.nz>
Sun, 11 Jan 2015 02:25:41 +0000 (15:25 +1300)
1  2 
ChangeLog

diff --cc ChangeLog
Simple merge