]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3300f6e 1ae0d8c)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 21 Mar 2010 14:06:09 +0000 (15:06 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 21 Mar 2010 14:06:09 +0000 (15:06 +0100)
1  2 
naoki/__init__.py patch | diff1 | diff2 | blob | history

diff --cc naoki/__init__.py
Simple merge
IPFire 3.x development tree