Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Fri, 8 Oct 2010 19:45:54 +0000 (21:45 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 8 Oct 2010 19:45:54 +0000 (21:45 +0200)
commit54d203c9b171a752a11f3e00bedb8420438b26c0
tree232245ca84f9c42dfc7451c9c2c20a3b60f91861
parent2e181ded77e2754e651cac550b7e60fe4686bf26
parent395a8b52d5e0b3b6a102cb7e2383902a8c3f0ae2
Merge branch 'master' into divVerent/crypto2

Conflicts:
all
all