Ateoto/character-builder — pull request #3 by Ateoto (2013-01-19 20:26:41+00:00)
Title: Merging issue2 changes into master

Does not fix the issue, I just want these particular changes in master.