Merge 2.0.
authorCarl Hetherington <cth@carlh.net>
Sun, 5 Oct 2014 22:54:26 +0000 (23:54 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 5 Oct 2014 22:54:26 +0000 (23:54 +0100)
commit152b14ab5509678f3d68b52a1ed275cfdc38191b
treedfb891a635e3e1062590308b41ae8263d993cd41
parentebcdc90fa32c22895b958126ba5a6a4d562616ad
parent3fe5cabf752fc6c87f6fbc453dfcd642655faed0
Merge 2.0.
ChangeLog