Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Sep 2013 08:06:10 +0000 (10:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Sep 2013 08:21:36 +0000 (10:21 +0200)
commit1906e00030b3f1cda2a5cf3abb3fcb08433eaa34
tree1ba606d41dbf6e49aa0902a4d5042b1881b48f37
parent32cde962969363bebc4ad49b770ffff39487d3f8
parent4370f65be8d714a0bc73047501027464aaa2466c
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  g2meet: Respect cursor_stride properly everywhere

See: c88ac1e0233f34582312dc617261b9270b61df19
Merged-by: Michael Niedermayer <michaelni@gmx.at>