]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/commit
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 5 Jan 2012 15:07:00 +0000 (16:07 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 5 Jan 2012 15:07:00 +0000 (16:07 +0100)
commit1f26ad8535e941eabe44a7ced807cba197bd8271
tree2d063124e215b692f6ef8abe4618d4de14ef897b
parentdd6ea837303dfd8288f456bb8d31ffe22f8d860d
parent2bd9b33ab279017554e98e7aa43f0a34555ba18b
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

Conflicts:
openssl/openssl.nm
openssl/openssl.nm