SirCotare 12db371ce0 merge from upstream ... --HG-- branch : gsoc2012-achievements		2013-02-15 16:29:35 +01:00
..
config.php.default	#1470 damn that merging... trying to remove malicious api	2013-02-15 16:28:00 +01:00
time.php	#1470 damn that merging... trying to remove malicious api	2013-02-15 16:28:00 +01:00