[Performous-commit] Tapio Vierros : Merge branch 'master' into joinmenu

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

Module: performous
Branch: joinmenu
Commit: 96e9c43548d43dbfa8b40361e30643892c33f304

Author: Tapio Vierros <tap...@gm...>
Date:   Tue Aug  3 14:33:58 2010 +0300

Merge branch 'master' into joinmenu

Conflicts:
	game/instrumentgraph.hh

---