]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commit
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into openssl-update
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 25 Dec 2013 19:44:24 +0000 (20:44 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 25 Dec 2013 19:44:24 +0000 (20:44 +0100)
commit37677cf0d1f3306316e08d9244b4e8184d6d2876
treeb90d3c4b0cfe3710be4cb576b668aac2e359c0fb
parent0f90adc0aa54d8a79b2a0b6061bcbf5ff5c98422
parent12f8cdd5895b4b87342c93247299984df5ef9a45
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into openssl-update