Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divVerent@alientrap.org>
Fri, 20 Aug 2010 12:23:54 +0000 (14:23 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Fri, 20 Aug 2010 12:23:54 +0000 (14:23 +0200)
commit5050382ea259ff33953768a43e9c341960e34c1d
treedab0b7ec957a7257ff00457270cffa1676fa4a44
parentbf4f35d6d29c8c3e3d726554b12332a8a86856fb
parentc3b65641f6ba82a8e001ab57b5d9117f907e7669
Merge branch 'master' into divVerent/crypto2

Conflicts:
all
all