Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Fri, 3 Sep 2010 11:41:53 +0000 (13:41 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 3 Sep 2010 11:41:53 +0000 (13:41 +0200)
commit72ab7cb162c2785d926f63f3c7cfbb6536a900fc
tree3b7acb728236f1575848d8840b6dc94700661654
parentcb2a4b93c1c72c8eb8d3d7cdd3b19947893d73e6
parent7063351ef7a63e94bea243d009e84c3ba3fc07ea
Merge branch 'master' into divVerent/crypto2