The following commit has been merged in the master branch:
commit 6d890ec11cda244af878bce40aaf28817d16fa87
Merge: fa026f0479f1ce52255c6f25dba299b7de54d5f6
e4c2005de55d41c725c009e2e1a008c3f46f6b1d
Author: Shaun Jackman sjack...@debian.org
Date: Thu Dec 29 12:32:02 2011 -0800
Merge commit
The following commit has been merged in the master branch:
commit 1c3f4475e101e5ff8f84e51ee2aa9773feddc1db
Author: Shaun Jackman sjack...@debian.org
Date: Thu Dec 29 12:56:00 2011 -0800
New upstream release.
diff --git a/debian/changelog b/debian/changelog
index 3809c40..a6732d3 100644
---