Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMatthias Fischer <fischerm@ipfire.org>
Sat, 28 Mar 2015 23:16:55 +0000 (00:16 +0100)
committerMatthias Fischer <fischerm@ipfire.org>
Sat, 28 Mar 2015 23:16:55 +0000 (00:16 +0100)
commit6c63e94298f768f21aac407885682eeb411ac4d5
tree758628a6dda6f17bb705410b32910743e04b601a
parent0e1fcef0180f7b6542be989f2c53db27c3cdd522
parente0b9a600e19f3829dcdf9858c776d7a169ea2ccc
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
lfs/openssl-compat