2014/12/15-18:37:22 (Linux thalamus unknown)
2014/12/19-20:33:38 (Linux thalamus unknown)
Merge branch 'master' of ssh://alioth/~philipp/public_git/tfbayes