The following commit has been merged in the master branch: commit 8c1fb2c2aa1ed1f5fa67a7d3459a9b6428aa337f Merge: 74db0801dd491805b1cfcbf3b0f35aaf8c3ada38 885c663956e419e7a72419681766d339262bb50c Author: Sven Eckelmann sven@narfation.org Date: Sun Jun 19 20:25:59 2011 +0200

Merge commit 'v2011.2.0'

Conflicts: main.h