]> arthur.barton.de Git - netatalk.git/commitdiff
projects / netatalk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1cf60f5 e01331b)
Merge branch 'desktop' into develop
authorFrank Lahm <franklahm@googlemail.com>
Tue, 17 Apr 2012 13:06:22 +0000 (15:06 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Tue, 17 Apr 2012 13:06:22 +0000 (15:06 +0200)

Trivial merge
Alex' Netatalk development repository