Merge branch 'master' into rorcz
commit4a20518936ae3253589ae1b22de348bc6c576655
authorJan Krüger <jk@jk.gs>
Wed, 30 Nov 2011 08:08:39 +0000 (30 09:08 +0100)
committerJan Krüger <jk@jk.gs>
Wed, 30 Nov 2011 08:08:39 +0000 (30 09:08 +0100)
treeaae500fa4b773ec57483d31a10278eaf94195ba1
parentc554c2a58727e475ccc41af7f0a7c70268e320c8
parentc503af2c8e275e11999fabaa54c767e1bf7a05dd
Merge branch 'master' into rorcz