Merge branch 'master' of ssh://git.ikiwiki.info

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index fc497b3c7351ea2151bfb14092568dbb687c3eb2..d443198f69618f28e37821766731b50bc2599306 100644 (file)
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 require 5.002;
 package IkiWiki::Plugin::calendar;

diff --git a/debian/changelog b/debian/changelog
index c8db76966c97c4cd156d0227219b5b35c7f8f54b..7eb34f8fed0eb9760b2f6ae19b5416d081c9892a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20120203) UNRELEASED; urgency=low
+
+  * Fix a snail mail address. Closes: #659158
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 08 Feb 2012 16:07:00 -0400
+
 ikiwiki (3.20120202) unstable; urgency=low
 
   * mdwn: Added nodiscount setting, which can be used to avoid using the

diff --git a/doc/bugs/__91__SOLVED__93___Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn b/doc/bugs/__91__SOLVED__93___Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn
index c80c9151a74ec48515392eced5074c79ead550fa..7282a71b8c317a9866789f30f62bd51a56bcef5e 100644 (file)
--- a/doc/bugs/__91__SOLVED__93___Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn
+++ b/doc/bugs/__91__SOLVED__93___Pandoc_plugin_and_UTF-8:_IkiWiki_and_UTF-8.mdwn
@@ -4,3 +4,8 @@ os.environment['LANG'] = 'it_IT.utf-8'
 Suona plausibile?
 
 [GitHub pykipandoc](https://github.com/temmen/pykipandoc) -- Temmen
+
+> The place to put contrib plugins is in [[plugins/contrib]].
+> 
+> Closing this bug report as whatever it is that was fixed is apparently not an ikiwiki
+> bug.. I guess.  [[done]] --[[Joey]]