Albert Santoni 230cdcccb4 Merge branch '2.5.x' into cc-5709-airtime-analyzer ... Conflicts: CREDITS		2015-01-22 11:29:38 -05:00
..
airtime.mo	updated translation resources	2015-01-15 11:12:14 +00:00
airtime.po	updated translation resources	2015-01-15 11:12:14 +00:00