Albert Santoni 3c064b13a9 Merge branch '2.5.x' into saas ... Conflicts: airtime_mvc/locale/hy/LC_MESSAGES/airtime.po airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.po		2015-02-18 16:03:14 -05:00
..
pro.po	Translation update, and fixed bad merge in fr_FR	2014-11-11 18:19:49 -05:00