Merge branch 'master' of github.com:mitsuhiko/babel

author Armin Ronacher <armin.ronacher@active-4.com>

Sun, 7 Jul 2013 21:22:30 +0000 (23:22 +0200)

committer Armin Ronacher <armin.ronacher@active-4.com>

Sun, 7 Jul 2013 21:22:30 +0000 (23:22 +0200)
author Armin Ronacher <armin.ronacher@active-4.com>
Sun, 7 Jul 2013 21:22:30 +0000 (23:22 +0200)
committer Armin Ronacher <armin.ronacher@active-4.com>
Sun, 7 Jul 2013 21:22:30 +0000 (23:22 +0200)
diff --cc ChangeLog
Simple merge
diff --cc INSTALL.txt
Simple merge
diff --cc babel/messages/pofile.py
Simple merge
author	Armin Ronacher <armin.ronacher@active-4.com>
	Sun, 7 Jul 2013 21:22:30 +0000 (23:22 +0200)
committer	Armin Ronacher <armin.ronacher@active-4.com>
	Sun, 7 Jul 2013 21:22:30 +0000 (23:22 +0200)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
INSTALL.txt	patch \|	diff1 \|	diff2 \|	blob \| history
babel/messages/pofile.py	patch \|	diff1 \|	diff2 \|	blob \| history