]> 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: 96e949b 3a80e06)
Merge branch 'naoki-shell'
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 2 Apr 2010 13:59:35 +0000 (15:59 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 2 Apr 2010 13:59:35 +0000 (15:59 +0200)
1  2 
naoki/backend.py patch | diff1 | diff2 | blob | history

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