Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Wed, 13 Oct 2010 19:40:52 +0000 (21:40 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 13 Oct 2010 19:40:52 +0000 (21:40 +0200)
commit22579d1d9f19436956f7a546237bc6dc79296c62
treea36a24874819b1ebc688263809d2427919702664
parent54d203c9b171a752a11f3e00bedb8420438b26c0
parentb7d048cfcd6613d5ae2d8f05816f7c623e75ee1e
Merge branch 'master' into divVerent/crypto2

Conflicts:
all
all