Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Sat, 2 Oct 2010 19:25:02 +0000 (21:25 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 2 Oct 2010 19:25:02 +0000 (21:25 +0200)
commit87a39db1a58fe7f801c51b6721515fa8e4a55251
tree6211a8c119582618746412c6caa6bdd0066339e7
parentf29b3346e03acc33131aee38ff7abeba6641ef5d
parent1a5f864472624d7725870a6b3d987da8b2cee3ed
Merge branch 'master' into divVerent/crypto2

Conflicts:
all
all