Coinffeine/coinffeine — pull request #185 by edrevo (2014-06-18 16:51:33+00:00)
Title: Fix build break

**Description** Two PRs were merged which worked OK by themselves, but the resulting merged code did not compile.
**Testing** Tests pass