From: Bdale Garbee <bdale@gag.com>
Date: Sun, 7 Aug 2011 08:04:09 +0000 (-0600)
Subject: Merge commit 'upstream/3.3.0'
X-Git-Tag: debian/3.3.0-1~13
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=b221e8dc16f345f8c8d7df8df71f4d36daaabb4c;p=debian%2Famanda

Merge commit 'upstream/3.3.0'
---

b221e8dc16f345f8c8d7df8df71f4d36daaabb4c
diff --cc gnulib/regenerate/regenerate
index 57565d7,d7f3a97..d7f3a97
mode 100644,100755..100644
--- a/gnulib/regenerate/regenerate
+++ b/gnulib/regenerate/regenerate