Files
bpfire/config
Arne Fitzenreiter e0027e6cdc Merge remote-tracking branch 'origin/next' into thirteen
Conflicts:
	config/rootfiles/core/52/meta
	config/rootfiles/core/53/filelists/strongswan
	config/rootfiles/core/53/meta
	config/rootfiles/core/54/filelists/strongswan
	config/rootfiles/core/54/meta
	config/rootfiles/core/55/exclude
	config/rootfiles/core/55/meta
	config/rootfiles/core/56/exclude
	config/rootfiles/core/56/meta
	config/rootfiles/core/57/exclude
	config/rootfiles/core/57/filelists/strongswan
	config/rootfiles/core/57/meta
	config/rootfiles/core/58/exclude
	config/rootfiles/core/58/filelists/strongswan
	config/rootfiles/core/58/meta
	config/rootfiles/core/59/exclude
	config/rootfiles/core/59/filelists/strongswan
	config/rootfiles/core/59/meta
	config/rootfiles/core/strongswan/exclude
	config/rootfiles/core/strongswan/filelists/strongswan
	config/rootfiles/core/strongswan/meta
	config/rootfiles/oldcore/52/meta
	config/rootfiles/oldcore/53/filelists/strongswan
	config/rootfiles/oldcore/53/meta
	config/rootfiles/oldcore/54/filelists/strongswan
	config/rootfiles/oldcore/54/meta
	config/rootfiles/oldcore/55/exclude
	config/rootfiles/oldcore/55/meta
	config/rootfiles/oldcore/56/exclude
	config/rootfiles/oldcore/56/meta
	config/rootfiles/oldcore/57/exclude
	config/rootfiles/oldcore/57/filelists/strongswan
	config/rootfiles/oldcore/57/meta
	config/rootfiles/oldcore/58/exclude
	config/rootfiles/oldcore/58/filelists/strongswan
	config/rootfiles/oldcore/58/meta
	config/rootfiles/oldcore/59/exclude
	config/rootfiles/oldcore/59/filelists/strongswan
	config/rootfiles/oldcore/59/meta
	lfs/dhcp
2012-09-20 07:45:00 +02:00
..
2012-08-29 12:25:24 -04:00
2009-05-15 08:07:25 +02:00
2011-06-01 23:46:42 +02:00
2011-01-22 19:07:34 +01:00
2007-11-04 19:23:06 +00:00
2012-06-26 15:19:36 +02:00
2010-12-10 13:29:23 +01:00
2012-09-06 16:55:27 +02:00
2012-08-03 19:22:05 +02:00
2011-06-24 06:40:34 +02:00
2011-09-03 12:31:09 +02:00
2009-03-18 16:58:38 +01:00
2012-08-08 10:48:55 +02:00
2009-07-18 15:12:31 +02:00
2009-06-01 16:02:10 +02:00
2008-03-04 18:39:29 +00:00
2007-06-10 19:10:01 +00:00
2007-11-04 18:52:27 +00:00
2011-02-20 15:51:15 +01:00
2008-03-04 18:39:29 +00:00
2012-08-30 19:17:17 +02:00
2010-03-14 11:38:06 +01:00
2008-03-04 06:37:05 +00:00
2011-11-27 12:50:19 +01:00
2006-07-19 14:59:29 +00:00
2010-12-02 16:30:11 +01:00
2011-10-02 17:40:28 +02:00
2007-07-29 17:55:20 +00:00
2008-06-14 11:54:51 +02:00
2010-01-20 23:24:32 +01:00
2009-03-24 22:39:11 +01:00
2012-08-03 19:22:05 +02:00