Merge branch 'master' into rorcz
commit25e61be915f5b2130cd3c9317ff2b8d9291b3a7e
authorJan Krüger <jk@jk.gs>
Fri, 19 Nov 2010 16:05:45 +0000 (19 17:05 +0100)
committerJan Krüger <jk@jk.gs>
Fri, 19 Nov 2010 16:05:45 +0000 (19 17:05 +0100)
tree0fceefba5e888692d81caa8125886f333a638dcd
parent408961aa20e9d2620589ea485d805cb3e77fe76e
parent59ed12e645ab56d5b75941f4afb96ab4b9449f2c
Merge branch 'master' into rorcz