git.ipfire.org Git - thirdparty/sarg.git/commit

]> git.ipfire.org Git - thirdparty/sarg.git/commit - po/el.po

author	Frédéric Marchal <fmarchal@users.sourceforge.net>
	Sun, 15 Jul 2012 18:54:36 +0000 (20:54 +0200)
committer	Frédéric Marchal <fmarchal@users.sourceforge.net>
	Sun, 15 Jul 2012 18:54:36 +0000 (20:54 +0200)
commit	b378aaf1fddc243e3001ff192b541c5fd5b3ed66
tree	011ae7cdadd9af43432fae064f40383dc25d9365	tree \| snapshot
parent	c7851516b0dec1989f34a8c95234a69f76f879e4	commit \| diff
parent	ebb1239d54323a0e770f8576295d934944f38f9f	commit \| diff

Merge remote branch 'origin/v2.3'

Conflicts:
authfail.c
denied.c
log.c
po/pl.po
report.c

Unnamed repository; edit this file 'description' to name the repository.