Merge branch 'r10-maint'
commit406040cdfff67f4d18f11f2e8e849574a997d900
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Mon, 3 May 2010 22:25:09 +0000 (4 01:25 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Mon, 3 May 2010 22:25:09 +0000 (4 01:25 +0300)
treece413e5d74384ee323ffb8d703e592bcbf248a07
parent4bece2fd857fe9ca0a844122c271ce163738314c
parent1760197fa46494453ce7d52f64264d3599edc174
Merge branch 'r10-maint'

Conflicts:
Changelog.utf8
Changelog.utf8