Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Thu, 14 Oct 2010 08:00:03 +0000 (10:00 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 14 Oct 2010 08:00:03 +0000 (10:00 +0200)
commit851b96062ead2bac361ce5aadbe46f44a7ecc5fc
tree26192ffd3615444f39114ab7e38a49f9a54842f5
parentd663da215de9e01b6fadbd6eba65d9cbcc4e2fd6
parent84f1a3182171c7463c7b03302c2f72be8eca083b
Merge branch 'master' into divVerent/crypto2

Conflicts:
all
all