Dirk Wagner f0dd065425 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit ...

Conflicts:
	config/etc/logrotate.conf

2015-01-06 15:51:29 +01:00

..

common

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit

2015-01-06 15:51:29 +01:00

core

dnsmasq: Import some patches from upstream

2015-01-02 11:49:07 +01:00

oldcore

Create Core Update 85

2014-10-15 19:48:16 +02:00

packages

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit

2015-01-06 15:51:29 +01:00