Merge in 0.70 branch with 0.71 fix.
authorCarl Hetherington <cth@carlh.net>
Thu, 24 Jan 2013 15:16:30 +0000 (15:16 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 24 Jan 2013 15:16:30 +0000 (15:16 +0000)
commit71ea64782f215c605877f5c231a2a8b1838fe8bd
tree3834141efc971fcc3edaac103bcb3962243673c1
parentfeea01f6109e00fddaacc9ae23f4cf6f55b4cabf
parent477e619088ed1f3f4a7b043af1cca72e19acab0d
Merge in 0.70 branch with 0.71 fix.
ChangeLog
debian/changelog
src/lib/encoder.cc
wscript