]> 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: 97a0d1c 5257051)
Merge remote-tracking branch 'stevee/python-module'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 20 Feb 2011 21:47:23 +0000 (22:47 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 20 Feb 2011 21:47:23 +0000 (22:47 +0100)

Trivial merge
IPFire 3.x development tree