[Performous-commit] Vincent Le Ligeour : Merge branch 'master' into joinmenu

[Yoda-JM <yo...@us...>]

Module: performous
Branch: joinmenu
Commit: a574fa87bd49c6cf2e7d297aef433b6fff82fcf5

Author: Vincent Le Ligeour <yo...@us...>
Date:   Sun Aug 15 16:50:29 2010 +0200

Merge branch 'master' into joinmenu

Conflicts:
	game/screen_intro.cc

---