Commit 2c2e36534c49a518467bf54cd932995768cfaa77

Con Kolivas 2012-06-14T03:40:18

Merge pull request #226 from kanoi/master miner.php allow a separate user settings file