2014/11/29-16:32:07 (Linux thalamus unknown)
Merge branch 'master' of ssh://alioth/~philipp/public_git/tfbayes