tree c08b63deb28c09ec49d9173280f1ca234debfe50
parent 7eceb03f083643254c7393c6b5ebe539e344a1ba
parent e101593561a10632c1d63180436b19f1d7115046
author Eric Barnes <eric@ericlbarnes.com> 1322371822 -0500
committer Eric Barnes <eric@ericlbarnes.com> 1322371822 -0500

Merge branch 'refs/heads/develop' into feature/unit-tests

Conflicts:
	user_guide/helpers/number_helper.html