Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 2 Dec 2011 02:01:06 +0000 (02:01 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 2 Dec 2011 02:01:06 +0000 (02:01 +0000)
commit7bd9400ff1331ac95ccf84c84b19a057d2946bf2
tree4c26a77b9979448e62f10ed1dd65cc32cde0cf4c
parentbd3091913b3adbd6607129deec5245d4657f27eb
parent895b88760fa4895e394252fc1958b32e4bfc2a58
Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
ext/dvdread/dvdreadsrc.c