]> 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: 09a33ca b121fbc)
Merge remote-tracking branch 'stevee/pyserial'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 24 Apr 2011 14:01:39 +0000 (16:01 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 24 Apr 2011 14:01:39 +0000 (16:01 +0200)

Trivial merge
IPFire 3.x development tree