From: Ben Hutchings <ben@decadent.org.uk>
Date: Mon, 7 Feb 2011 12:31:12 +0000 (+0000)
Subject: Merge remote branch 'jcristau/master'
X-Git-Tag: 1.2.10~1
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=cd758c798d0c48f8161e5102faf8d862ba76aa2d;hp=cd758c798d0c48f8161e5102faf8d862ba76aa2d;p=videolink.git

Merge remote branch 'jcristau/master'

Update ChangeLog based on debian/changelog entry 1.2.9-2.1.

Resolve conflict on setting of moz_ldflags_extra in Makefile.
---