Merge remote-tracking branch 'origin/3.8.x' into 3.8.x
authorChris Cormack <chris@bigballofwax.co.nz>
Fri, 26 Apr 2013 21:26:44 +0000 (09:26 +1200)
committerChris Cormack <chris@bigballofwax.co.nz>
Fri, 26 Apr 2013 21:26:44 +0000 (09:26 +1200)
commit642fb2b85b8cdc39e81f7fe19b05608d4b4a4ea2
tree9194acbbde344d2efd737623e00d3da17da8d77c
parentc8c80a8e787ff04cf167dbeae7602a484e22f977
parentf5593842dc99211192955a4e70818de18b6204b5
Merge remote-tracking branch 'origin/3.8.x' into 3.8.x