Merge branch 'master' into Issue24

Merged whitespace removal commit from upstream master, didn't think i
should rebase branch commits as already pushed commits to my forked
branch so they are public, i am new to pull requests
This commit is contained in:
pmcgrath 2014-10-20 22:13:44 +01:00
commit 7b579e75ad
2 changed files with 2 additions and 2 deletions