Merge branch 'master' into terencehill/misc_bugfixes
authorterencehill <piuntn@gmail.com>
Fri, 13 Aug 2010 14:56:49 +0000 (16:56 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 13 Aug 2010 14:56:49 +0000 (16:56 +0200)
commitb8aa1648694011379b5b1ec22b5708684381fabc
tree46c9319f0537bd791c4e1a293c4f8879e645636d
parent0c6fc307c63947463f12d20b1774b714b54d846f
parent043b5eb32eb58a85444caa6abada1b9fa811100e
Merge branch 'master' into terencehill/misc_bugfixes