Merge branch 'master' into rorcz
commitafe79444fbb11256b0e55ec7b9150931f6e1dc5c
authorJan Krüger <jk@jk.gs>
Mon, 15 Nov 2010 21:04:25 +0000 (15 22:04 +0100)
committerJan Krüger <jk@jk.gs>
Mon, 15 Nov 2010 21:04:25 +0000 (15 22:04 +0100)
tree1df98f46559f03927df6fc5b6a166da778af1497
parent43edda2c4ffef2618076d3fb48c22d53bb19587a
parent8a348d200bdb18273b2e0a6e42d53026fdb98426
Merge branch 'master' into rorcz