]> arthur.barton.de Git - netatalk.git/commit
Merge branch 'branch-netatalk-3-1' of netafp.com:git/netatalk into branch-netatalk-3-1
authorRalph Boehme <rb@sernet.de>
Wed, 18 Jun 2014 15:00:36 +0000 (17:00 +0200)
committerRalph Boehme <rb@sernet.de>
Wed, 18 Jun 2014 15:00:36 +0000 (17:00 +0200)
commit34bc1896576cd73dcb7fd2605b978c9ed9e4d1ac
treeb421ed900dcecccf2d965c69e3030a7bf5d1a3ba
parent3988114e763aceb0d06ffb9a64549dec5a9500ff
parent8e7175c4aadab737d0c6e15df37b04b86dfb5226
Merge branch 'branch-netatalk-3-1' of netafp.com:git/netatalk into branch-netatalk-3-1

Conflicts:
NEWS
NEWS