Merge branch 'master' into mand1nga/update-docs
authormand1nga <mand1nga@xonotic.org>
Mon, 29 Aug 2011 16:05:53 +0000 (13:05 -0300)
committermand1nga <mand1nga@xonotic.org>
Mon, 29 Aug 2011 16:05:53 +0000 (13:05 -0300)
commit4025b24009d98a0418fc2de9e55687d971503c0c
treed41f639ec6a64d79a8818190feec29d0351f869c
parentad36f98ae3f86c1d4ab3181dbaeceb42794f7c9f
parentd552313a62d6d82d315c90b70dbb9c67569cb647
Merge branch 'master' into mand1nga/update-docs