]> git.ipfire.org Git - people/shoehn/ipfire.org.git/commit
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 15 Jul 2012 09:19:29 +0000 (11:19 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 15 Jul 2012 09:19:29 +0000 (11:19 +0200)
commitb439738d7ea9c745afb77fc2559f9ad9c22cdb6e
tree6b17fe82312dc42b97d57344e43c37c57fd0f791
parent60024cc83467cca1116da16d04d744ef15334edb
parent626a896b0f604069e22a15d3ad493d23cb782712
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org

Conflicts:
www/templates/stasy-profile-detail.html