commit 5ec8b170bce99a567b1e76dcdd81d54b0444a66f
Merge: ed56393 55e1861
Author: Paul van Tilburg <paul@mozcode.nl>
Date:   Fri Jun 19 21:41:31 2015 +0200

    Merge branch 'feature/08650a-customer-time-entries' into development (closes: #08650a)