Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divVerent@alientrap.org>
Thu, 2 Sep 2010 10:30:19 +0000 (12:30 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Thu, 2 Sep 2010 10:30:19 +0000 (12:30 +0200)
commit53277300e7356ea6265e48a087cd2a234c962a14
tree041fc2fe75b250ebcc6402fa70108f01a8a3c511
parent7247fd01642ccf7c60a32053b1b9673441ba2833
parent0c1da75a8eb31779525088296a592d31d2c059d9
Merge branch 'master' into divVerent/crypto2

Conflicts:
all
all