Merge pull request #410 from etanol/decimal-control

author Aarni Koskela <akx@iki.fi>

Fri, 8 Jul 2016 19:24:13 +0000 (22:24 +0300)

committer GitHub <noreply@github.com>

Fri, 8 Jul 2016 19:24:13 +0000 (22:24 +0300)
author Aarni Koskela <akx@iki.fi>
Fri, 8 Jul 2016 19:24:13 +0000 (22:24 +0300)
committer GitHub <noreply@github.com>
Fri, 8 Jul 2016 19:24:13 +0000 (22:24 +0300)
diff --cc babel/numbers.py
Simple merge
diff --cc tests/test_numbers.py
Simple merge
author	Aarni Koskela <akx@iki.fi>
	Fri, 8 Jul 2016 19:24:13 +0000 (22:24 +0300)
committer	GitHub <noreply@github.com>
	Fri, 8 Jul 2016 19:24:13 +0000 (22:24 +0300)
		1	2
babel/numbers.py	patch \|	diff1 \|	diff2 \|	blob \| history
tests/test_numbers.py	patch \|	diff1 \|	diff2 \|	blob \| history