Merge fixes in r10.14
commit196b3b7352ea5d6c05541a69847746966079f48a
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Wed, 28 Jul 2010 19:28:45 +0000 (28 22:28 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Wed, 28 Jul 2010 19:28:45 +0000 (28 22:28 +0300)
treef929966fe3e9aa86efc837869cfbbdc2e0583e5a
parent170de50d8f5d638ce84145563b20cb2e7f5626e7
parent2e551fd1d43bec2835596155ec9c74a4c14e91ea
Merge fixes in r10.14

Conflicts:
Changelog.utf8
VERSIONINFO
Changelog.utf8