]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commit
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 7 May 2010 14:09:46 +0000 (16:09 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 7 May 2010 14:09:46 +0000 (16:09 +0200)
commitc10e3ff758a13d6a8a7817480f3db7de7f025faf
tree54600d916544ef85a965cb271ddce52838c51897
parent0c9ca16527059ad669d857e4a5da7b94454125ae
parente1f6992d3668315699f029a14d7bdbdf641c1085
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

Conflicts:
tools/quality-agent.d/095-directory-layout
naoki/backend.py
tools/quality-agent.d/095-directory-layout