[Netatalk-git]Netatalk git repository. branch, master, updated. netatalk-2-1-4-511-g06b7f57

[franklahm <fra...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Netatalk git repository.".

The branch, master has been updated
       via  06b7f576daa4a127964febf210869f4729235dc3 (commit)
       via  abe2e8f803429c7349dff2486e36c6e0e3859448 (commit)
       via  6fb54052721880f8ee01aeee820c329dcf4d5963 (commit)
      from  5825df1c826101269dccd558ac9ac85c0dcd4e36 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 06b7f576daa4a127964febf210869f4729235dc3
Merge: abe2e8f803429c7349dff2486e36c6e0e3859448 6fb54052721880f8ee01aeee820c329dcf4d5963
Author: Frank Lahm <fra...@go...>
Date:   Sat Apr 16 16:42:16 2011 +0200

    Fix merge conflict

commit abe2e8f803429c7349dff2486e36c6e0e3859448
Author: Frank Lahm <fra...@go...>
Date:   Sat Apr 16 16:36:57 2011 +0200

    Log message

-----------------------------------------------------------------------

Summary of changes:
 etc/cnid_dbd/cmd_dbd.c    |   21 +++++++++------------
 etc/cnid_dbd/cnid_metad.c |    3 ++-
 2 files changed, 11 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
Netatalk git repository.