Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divVerent@alientrap.org>
Mon, 13 Sep 2010 08:34:50 +0000 (10:34 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Mon, 13 Sep 2010 08:34:50 +0000 (10:34 +0200)
commit5766d4c05a54d6def81de079cfa6fa352bfe9a25
tree1111a867b98f169327bed024d170016bfd953a61
parentf9b0f5a1684384801520ec3ea1fa8c5e4ed111ae
parent43b602de2baa6dfb5360bcca087ed4976a2e0049
Merge branch 'master' into divVerent/crypto2

Conflicts:
all
all