]> arthur.barton.de Git - netatalk.git/commitdiff
projects / netatalk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc2fd80 06f637a)
Merge branch 'master' of netafp.com:git/netatalk
authorFrank Lahm <franklahm@googlemail.com>
Wed, 13 Jul 2011 09:14:54 +0000 (11:14 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Wed, 13 Jul 2011 09:14:54 +0000 (11:14 +0200)

Trivial merge
Alex' Netatalk development repository