Sebastian Grewe 1387bbdf44 [MERGE] Merge conflict NEXT		2013-09-18 16:34:52 +02:00
..
admin_settings.inc.php	adding cold wallet coin display and setting	2013-09-17 16:15:18 +02:00
global.inc.dist.php	Merge branch 'next' into issue-145	2013-09-17 08:53:21 +02:00
memcache_keys.inc.php	[IMPROVEMENT] Adding incremental round/user shares	2013-09-18 09:45:52 +02:00