[Performous-commit] Markus Raab : Merge branch 'master' of ssh://godman707@git.performous.org/ gitroot/performous/performous

[Markus R. <god...@us...>]

Module: performous
Branch: master
Commit: c02c01fb95a15d66cb3f3ea26f513f12316ce9cc

Author: Markus Raab <un...@ma...>
Date:   Fri Dec 11 13:30:49 2009 +0100

Merge branch 'master' of ssh://godman707@git.performous.org/gitroot/performous/performous

Conflicts:

	docs/Authors.txt

---