Merge branch 'strings-master'
authorMikko Rasa <tdb@tdb.fi>
Wed, 25 May 2011 13:46:08 +0000 (16:46 +0300)
committerMikko Rasa <tdb@tdb.fi>
Wed, 25 May 2011 13:46:08 +0000 (16:46 +0300)
commitb56eb5ec1da675da0c66abc53c1e4f6c4e4cccbd
tree8071d2bd12b6030c765ac355ff249f9f51f7703a
parentd5dd704b2576f878809e87dbb8ff8591b9bdbce4
parentb42ed73a1b241c0e93ee03c43c4584b41c549bac
Merge branch 'strings-master'

Conflicts:
.gitignore
Build
Changelog.txt
.gitignore
Build
Changelog.txt