]> git.ipfire.org Git - people/stevee/pakfire.git/commit
Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 14 Nov 2011 14:37:07 +0000 (15:37 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 14 Nov 2011 14:37:07 +0000 (15:37 +0100)
commit3cd0a8bec8b6cc5f4a8cd840d922217979dcd41c
treee2ecb919f9b1262f8f4250df0a2fe2f825dc75b7
parent982a5429ae5cff5cca5b22c328a12e3106d26bc5
parent15ec6658c90c0f217c9f6428147052b2f48d4c13
Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire

Conflicts:
po/pakfire.pot
po/pakfire.pot