Merge branch 'master' of github.com:nuttycom/ananke

Conflicts: src/Ananke/TimeLog.hs

Created by  Kris Nuttycombe  on March 26, 2014
2OIPAQCBDIUJBXB4K2QVP3IEBIUOCQHSWSWFVMVSVZC7GHX2VK7AC
Change contents