Albert Santoni 6e6d20d3fc Merge branch '2.5.x-serbian-croatian' of https://github.com/danielhjames/Airtime into 2.5.x ... Conflicts: airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.mo airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.mo airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.mo airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.mo airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po		2014-04-01 10:30:00 -04:00
..
upgrade.sql	Merge branch '2.5.x-serbian-croatian' of https://github.com/danielhjames/Airtime into 2.5.x	2014-04-01 10:30:00 -04:00