[pLog-svn] r6289 - in plog/trunk: . class/data/validator class/misc class/test/tests/misc config docs-devel gallery install locale locale/admin plugins release templates/LifeType/en_UK

[Mark Wu]

> 
> I guess we should stop making commits to 1.2 branche unless 
> it's security related. Poor Mark constantly has to merge 
> stuff down. And we should all be working on 2.0 by now :)
> 
> oh, well. What do you guys think? (i.e. jon, as mark is 
> already working on 2.0 ) ;-)

It's okay for me.

I prefer small merge, it is easier than big merge :)

Mark