[pLog-svn] r5614 - in plog/trunk: class/dao class/dao/userdata class/xml/rssparser/magpierss locale locale/admin templates/admin

[Oscar Renalias]

I thought you already did a merge a few days ago?

On 7/5/07, mark at devel.lifetype.net <mark at devel.lifetype.net> wrote:
> Author: mark
> Date: 2007-07-05 03:46:04 -0400 (Thu, 05 Jul 2007)
> New Revision: 5614
>
> Modified:
>    plog/trunk/class/dao/bayesianfilterinfos.class.php
>    plog/trunk/class/dao/permissions.class.php
>    plog/trunk/class/dao/userdata/simplepostnukeuserdataprovider.class.php
>    plog/trunk/class/dao/userdata/wbbuserdataprovider.class.php
>    plog/trunk/class/xml/rssparser/magpierss/rss_fetch.inc
>    plog/trunk/locale/admin/locale_de_DE.php
>    plog/trunk/locale/locale_de_DE.php
>    plog/trunk/templates/admin/newpost.template
> Log:
> Merge from the 1.2 branch to 1.3 trunk (5600 to 5613)