[TASK] Merge Feature "Add quarter as expiration time" and "Set default expiration time branch"
requested to merge pixelbrackets/Jirafeau:20170113_merge-quarter-as-expiration-time-and-default-expiration-time-branch into master
This combines Pull Request !22 (closed) (#57 (closed)) and !23 (closed) (#87 (closed)) which hopefully makes it easier for you to merge these into master at once :) (if you want to do so)