]> git.ipfire.org Git - people/ms/ipfire-2.x.git/commit
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x into owncloud
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 2 Oct 2013 12:27:08 +0000 (14:27 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 2 Oct 2013 12:27:08 +0000 (14:27 +0200)
commitc47d500d573e80b13abb377cae3cd52ff5a8f84c
tree76d1a276915aced89639282dafea7cd59ef6dcd4
parenteb3ca99d9dd8b26953ea9edb98ffa47e438b55fc
parentcd010e09a321ab562ff45da1b27e521da160c71f
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x into owncloud