Merge master; at least partially.
authorCarl Hetherington <cth@carlh.net>
Tue, 2 Jul 2013 11:47:17 +0000 (12:47 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 2 Jul 2013 11:47:17 +0000 (12:47 +0100)
commit938f413bb4ebecd51c805027e331cb7eb0ca9502
tree27fa1618657055b7421d4987b25987b48958b764
parentc2bac22380bea453665a24c6f39200a977771daf
parentf51e1ec6f5cacd05196ce7625709c18f6b38f63e
Merge master; at least partially.
src/cpl.cc
src/subtitle_asset.cc
test/wscript
wscript