Merge changes from JPC-RR release 10.7
commiteaee853d290ad5d799e91b908d7ba490a97f2026
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Sun, 9 May 2010 13:33:05 +0000 (9 16:33 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Sun, 9 May 2010 13:33:05 +0000 (9 16:33 +0300)
treecafab3840c13a928e06942bb71cea2d656de6fa6
parent406040cdfff67f4d18f11f2e8e849574a997d900
parentec00087b08fddd1169a99bf8f6f429da9543c45a
Merge changes from JPC-RR release 10.7

Conflicts:
Changelog.utf8
Changelog.utf8