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

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

Module: performous
Branch: joinmenu
Commit: 6f90b1ace68cda728d2953d4d3240c67f6927699

Author: Tapio Vierros <tap...@gm...>
Date:   Fri Jul 16 18:17:11 2010 +0300

Merge branch 'master' into joinmenu

Conflicts:
	game/dancegraph.cc
	game/instrumentgraph.hh
	game/menu.cc
	game/menu.hh

---