]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: a884414 fb25052)
Merge branch 'cryptodev' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 10 Mar 2010 13:24:12 +0000 (14:24 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 10 Mar 2010 13:24:12 +0000 (14:24 +0100)

Trivial merge
Peter's tree of IPFire 2.x