Merge branch 'master' into rorcz
commitecebd3ebc95e63457be31e1ce5f8b4ea8bf1a88e
authorJan Krüger <jk@jk.gs>
Wed, 28 Mar 2012 09:03:15 +0000 (28 11:03 +0200)
committerJan Krüger <jk@jk.gs>
Wed, 28 Mar 2012 09:03:15 +0000 (28 11:03 +0200)
tree1e39856f7708bd3443b5a061198d9132586816ed
parent46c9ddcd8b48220661c4e5b26ffaaf5e8f0d5573
parent9322b08776f5162db414ed256791744ffacf3c55
Merge branch 'master' into rorcz