bnu 4506ea440e Merge branch 'release/1.7.8' into develop ... Conflicts: classes/context/Context.class.php config/config.inc.php		2014-12-09 15:13:08 +09:00
..
lang.info	reverse merge from 1.6.0 (r10668, r10667, r10600, r10596, r10595, r10594, r10578, r10572)	2012-05-17 06:27:55 +00:00
lang.xml	Merge branch 'release/1.7.8' into develop	2014-12-09 15:13:08 +09:00