2 commits

Author	SHA1	Message	Date
Albert Santoni	f40357f972	Added missing git config stuff	2014-08-27 16:51:37 -04:00
Albert Santoni	2ac3633f69	3-way git merge driver for PO files and development bootstrapping script (the start of it anyways)	2014-08-27 16:43:54 -04:00