drigato bc080a26f7 Merge branch '2.5.x' into cc-5709-airtime-analyzer ... Conflicts: airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po		2014-05-06 14:50:13 -04:00
..
application	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2014-05-06 14:50:13 -04:00
build	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2014-04-23 15:58:39 -04:00
library	Remove swear words from source code	2013-09-23 16:16:51 +01:00
locale	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2014-05-06 14:50:13 -04:00
public	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2014-04-23 15:58:39 -04:00
tests	Fixed permissions of unit tests	2014-03-19 17:34:07 -04:00