Merge pull request #4280 from jmarshallnz/settings_cleanup
authorTrent Nelson <trent.a.b.nelson@gmail.com>
Thu, 27 Feb 2014 00:41:46 +0000 (19:41 -0500)
committerTrent Nelson <trent.a.b.nelson@gmail.com>
Thu, 27 Feb 2014 00:41:46 +0000 (19:41 -0500)
commitd5fa13898cc5060a5d0adf1e7fa6ad42032b573c
tree8fe6032f9766ddba34560afddb0eda93bfca755d
parentb8512bf8bbff9eb96c66b09ce4ff6ac9a56b42dd
parent3045ef96b91845eecfbcfaf27073bc10fec11ad6
Merge pull request #4280 from jmarshallnz/settings_cleanup

Settings cleanup