Moises Silva 94ceff6842 Merge branch 'master' into smgmaster
Conflicts:
	build/modules.conf.in
	src/mod/loggers/mod_logfile/mod_logfile.c
2012-01-31 16:56:29 -05:00
..
2012-01-27 16:04:54 -06:00
2012-01-08 14:19:16 -06:00
2012-01-31 16:56:29 -05:00
2011-12-14 12:16:09 -06:00