Merge branch 'master' of git://mika.l3ib.org/obconf
authorDana Jansens <danakj@orodu.net>
Fri, 25 Jan 2008 03:06:48 +0000 (22:06 -0500)
committerDana Jansens <danakj@orodu.net>
Fri, 25 Jan 2008 03:06:48 +0000 (22:06 -0500)
commit4b9273e09f7e6af9465c849525ac98df3cfb9762
tree5831ef69cf2827ee690bf002213efe7a2d936a23
parent8496d6bf5b75483eeb5670522d980d95637cd9b8
parent41fbca7ce33be2982da73205a49100731ab641c8
Merge branch 'master' of git://mika.l3ib.org/obconf

Conflicts:

po/sv.po
po/sv.po