Commit [f0f09f] Maximize Restore History

Merge remote-tracking branch 'origin/released'

Conflicts:
X11/xtrans/Xtrans.c

marha marha 2014-03-28