Merge master.
authorCarl Hetherington <cth@carlh.net>
Fri, 26 Apr 2013 22:49:54 +0000 (23:49 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 26 Apr 2013 22:49:54 +0000 (23:49 +0100)
commit87a709a4ea5dffaadaf35ef94edb4b578eb3b56c
treef8a5aa8e9a2e16ebe4a38b917fd5bc9654866789
parentccc07eebc492d74c351c235584fd708c46b5b656
parent86011ad6b4ea0004a51c59b0563cf89c0947546d
Merge master.
ChangeLog