[pLog-svn] trunk merging

[Oscar Renalias]

On 19 Dec 2006, at 13:43, Jon Daley wrote:

> On Tue, 19 Dec 2006, Oscar Renalias wrote:
>> Regarding strings.txt, we should just take the newest version or else
>> we'll lose the changes again.
> 	I wasn't sure which was the newest version.

Done, I've made sure that the current version is the latest one.

>
>> Regarding wizard.php, both changes should be kept as they are related
>> to something we forgot to do when upgrading LT 1.0 to LT 1.1.x.
> 	Can you look at it?  I couldn't tell what was what.

I had a look at this and I don't think it's necessary anymore. Those  
two steps were only for upgrading from LT 1.1 to 1.1.1 but that's not  
necessary anymore so we can leave it as it is.