2013/10/24-15:09:55 (Linux thalamus unknown)
Merge branch 'master' of ssh://alioth/~philipp/public_git/tfbayes