2014/12/10-20:41:54 (Linux thalamus unknown)
Merge branch 'master' of ssh://alioth/~philipp/public_git/tfbayes