Commit [71cc8d]  Maximize  Restore  History

Merge remote-tracking branch 'origin/released'

Conflicts:
apps/xwininfo/xwininfo.c
xorg-server/hw/xwin/glx/indirect.c

marha marha 2014-06-08