Marc Alexander 34cdbd0360 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314 ... Conflicts: phpBB/styles/prosilver/template/timezone.js		2013-03-26 13:18:54 +01:00
..
core.js	Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314	2013-03-26 13:18:54 +01:00
jquery.js	[ticket/10155] Update to jQuery 1.6.2	2011-07-12 10:24:20 +02:00