Merge branch 'master' into windows-debug
authorCarl Hetherington <cth@carlh.net>
Mon, 6 Jan 2014 11:07:20 +0000 (11:07 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 6 Jan 2014 11:07:20 +0000 (11:07 +0000)
commitc7763b01172ec854d80199000e9536393806e882
treebeb795804bf37bb643211d8c5989b9b28de22c6c
parent1d49c6b90bc8f6a0e5e7ff0a2e7aeae3e3043a6d
parent89f66ac25a5fffa04cf3abc569a0b4eaf7259320
Merge branch 'master' into windows-debug