Stefan Seyfried 0a6e405603 Merge branch 'check/next' into master
Conflicts:
	data/locale/english.locale
	src/neutrino.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Commit: 8048673dec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-07 (Thu, 07 Mar 2013)
2013-03-07 17:10:11 +01:00
2013-03-06 17:23:46 +01:00
2013-03-07 17:10:11 +01:00
2012-04-17 19:33:50 +02:00
2009-12-08 11:05:11 +00:00
2009-12-08 11:18:17 +00:00

The file is empty.
Languages
C++ 85%
C 12.5%
Shell 0.6%
Makefile 0.6%
M4 0.5%
Other 0.7%