Merge branch 'master' into rorcz
commit43edda2c4ffef2618076d3fb48c22d53bb19587a
authorJan Krüger <jk@jk.gs>
Sat, 6 Nov 2010 19:00:57 +0000 (6 20:00 +0100)
committerJan Krüger <jk@jk.gs>
Sat, 6 Nov 2010 19:00:57 +0000 (6 20:00 +0100)
tree93ab53b99daa099a1d04f119f06463e2920a9edb
parent1ca168f99f4ddddbeb077ee23720fdacf54b05d2
parent803d03caeabb0998e4b07732bec08b4e99471f1b
Merge branch 'master' into rorcz