Merge pull request #559 from python-babel/authors

author Aarni Koskela <akx@iki.fi>

Mon, 28 May 2018 07:56:37 +0000 (10:56 +0300)

committer GitHub <noreply@github.com>

Mon, 28 May 2018 07:56:37 +0000 (10:56 +0300)
author Aarni Koskela <akx@iki.fi>
Mon, 28 May 2018 07:56:37 +0000 (10:56 +0300)
committer GitHub <noreply@github.com>
Mon, 28 May 2018 07:56:37 +0000 (10:56 +0300)
diff --cc babel/messages/catalog.py
Simple merge
diff --cc babel/numbers.py
Simple merge
diff --cc tests/messages/test_pofile.py
Simple merge
author	Aarni Koskela <akx@iki.fi>
	Mon, 28 May 2018 07:56:37 +0000 (10:56 +0300)
committer	GitHub <noreply@github.com>
	Mon, 28 May 2018 07:56:37 +0000 (10:56 +0300)
		1	2
babel/messages/catalog.py	patch \|	diff1 \|	diff2 \|	blob \| history
babel/numbers.py	patch \|	diff1 \|	diff2 \|	blob \| history
tests/messages/test_pofile.py	patch \|	diff1 \|	diff2 \|	blob \| history