Commit [059f52]  Maximize  Restore  History

Merge remote-tracking branch 'github/cd'

Conflicts:
gemrb/core/Interface.cpp
gemrb/core/Interface.h
gemrb/plugins/KEYImporter/KEYImporter.cpp

Tom Prince Tom Prince 2011-09-24