Merge fixes in JPC-RR r10.13
commita3a1cba13d159e40efa6bf79862c0d56fbb35ba0
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Thu, 1 Jul 2010 23:55:15 +0000 (2 02:55 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Thu, 1 Jul 2010 23:55:42 +0000 (2 02:55 +0300)
treed47607bcdda220e405e7bd80fb57642c20223640
parent03e8fe9fb872944ccc27d125859e92c730ae55d5
parent064360d41fa0ff20da0a91a8f31b52612cda02ab
Merge fixes in JPC-RR r10.13

Conflicts:
Changelog.utf8
VERSIONINFO
Changelog.utf8