denise fc4ccb4798 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel ... Conflicts: airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.mo		2013-01-04 17:21:46 -05:00
..
LC_MESSAGES	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2013-01-04 17:21:46 -05:00