]> arthur.barton.de Git - netatalk.git/commit - doc/www/ReleaseNotes
Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop
authorFrank Lahm <franklahm@gmail.com>
Mon, 28 Oct 2013 09:34:25 +0000 (10:34 +0100)
committerFrank Lahm <franklahm@gmail.com>
Mon, 28 Oct 2013 09:34:25 +0000 (10:34 +0100)
commit8c25635e752ff3cf4d9abb6965363627d1cab4d7
tree3c398054dc93653449d7f38450795f5c3cdf1c80
parent9c64a3144883934e895e1b5c79952fccb88ef7b1
parent71d10aa713b9ba555f1fc962de2dd0c83253609e
Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop

Conflicts:
NEWS
VERSION
doc/www/ReleaseNotes
NEWS
doc/www/ReleaseNotes
libatalk/Makefile.am