2014/11/26-17:18:21 (Linux thalamus unknown)
Merge branch 'master' of ssh://alioth/~philipp/public_git/tfbayes