Merge branch 'v3.4'master
commite76823bc716477d3d5e26d17d0df7a2314bc2d82
authorAndrew Arnott <andrewarnott@gmail.com>
Sat, 25 Dec 2010 03:38:05 +0000 (24 19:38 -0800)
committerAndrew Arnott <andrewarnott@gmail.com>
Sat, 25 Dec 2010 03:38:05 +0000 (24 19:38 -0800)
treed031daaafa5b3921afd0a2a75e9f1cc2b08b1ab7
parentd79f0d578c9c80c7528bf5c57eb883b1ff550e2d
parent9d61c9f3d0aca3a78ae968523fc4d1435a57881b
Merge branch 'v3.4'

Conflicts:
src/version.txt