Merge branch 'master' into devel
authorSimon Schubert <2@0x2c.org>
Wed, 2 Jun 2010 12:03:15 +0000 (14:03 +0200)
committerSimon Schubert <2@0x2c.org>
Wed, 2 Jun 2010 12:03:15 +0000 (14:03 +0200)
commitf6c8f75e741f068f0b50c7cc3c64672835bc1724
treefd47252bd6153ea5f49ddd6e4bc862bec131f55d
parent817403f435982ef7fc7b4e589d85ecd7823157a2
parent8b533381dafb8779e02c6e53a8a422f194744e54
Merge branch 'master' into devel