Merge master.
authorCarl Hetherington <cth@carlh.net>
Sat, 10 Nov 2012 22:50:20 +0000 (22:50 +0000)
committerCarl Hetherington <cth@carlh.net>
Sat, 10 Nov 2012 22:50:20 +0000 (22:50 +0000)
commit60990830b23f295d218b6ae549654e5c67a7bdff
tree93b0218bbc47ecd80c416138b44fd44d86793a20
parent3d9b5186aa39150e53aef3bab09f4350f85cb885
parent5be073cfa54f0b12432f59106a50086f92678435
Merge master.
release