updated translation resources
3-way git merge driver for PO files and development bootstrapping script (the start of it anyways)
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
Added missing git config stuff
One more time!
Merge branch '2.5.x' into saas