Commit [26dfcd]  Maximize  Restore  History

Merge remote-tracking branch 'origin/released'

Conflicts:
mesalib/src/mesa/main/imports.h

marha marha 2014-05-11