Merge remote-tracking branch 'kc/3.8.x' into 3.8.x
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 15 May 2013 21:45:55 +0000 (09:45 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 15 May 2013 21:45:55 +0000 (09:45 +1200)
commitf05bb04470a96eb66fa30c1b93ac7b8357db6446
treea6ffcce58d683cf357b008682a95adc4e2e68e7d
parent7925b98ee8d2f1e456cf6459e14197a50b20cf09
parentc3cdfb0e4a8f36a7d6b0218dc34b94cecaf39cc2
Merge remote-tracking branch 'kc/3.8.x' into 3.8.x