commit 8e725980efb20b609610070667717bf9b725c323
Merge: 674a8ac 320c252
Author: Jan Rękorajski <[email protected]>
Date: Thu Sep 6 13:51:47 2012 +0200
Merge branch 'master' of git://git.pld-linux.org/packages/netatalk
Conflicts:
netatalk.spec
---
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/netatalk.git/commitdiff/8e725980efb20b609610070667717bf9b725c323
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
