From: Michael Tremer Date: Sun, 15 Jul 2012 09:19:29 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b439738d7ea9c745afb77fc2559f9ad9c22cdb6e;p=ipfire.org.git Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org Conflicts: www/templates/stasy-profile-detail.html --- b439738d7ea9c745afb77fc2559f9ad9c22cdb6e