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

[Tapio V. <aa...@us...>]

Module: performous
Branch: joinmenu
Commit: 4100d6c33a736306a58835bf107f146b4b1f972b

Author: Vincent Le Ligeour <yo...@us...>
Date:   Mon Jul 26 13:57:42 2010 +0200

Merge branch 'master' into controllers

---