[DRE-commits] [SCM] ruby-merb-core.git branch, master, updated. upstream/1.1.3-17-gfa35844

[Tollef Fog Heen]

The following commit has been merged in the master branch:
commit 731f10c77cedbca795259928b8c9f4daf9557449
Author: Tollef Fog Heen <tfheen at debian.org>
Date:   Tue May 22 21:14:03 2012 +0200

    Get rid of FIXME in .docs file.

diff --git a/debian/changelog b/debian/changelog
index 07e1303..311934f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ruby-merb-core (1.1.3+dfsg-2) UNRELEASED; urgency=low
 
   * Correct copyright file
+  * Get rid of FIXME in .docs file.
 
  -- Tollef Fog Heen <tfheen at debian.org>  Tue, 22 May 2012 21:13:08 +0200
 
diff --git a/debian/ruby-merb-core.docs b/debian/ruby-merb-core.docs
index 786a9ba..e845566 100644
--- a/debian/ruby-merb-core.docs
+++ b/debian/ruby-merb-core.docs
@@ -1,2 +1 @@
-# FIXME: READMEs found
-# README
+README

-- 
ruby-merb-core.git