From: Florian Ragwitz <rafl@debian.org>
Date: Fri, 5 Jun 2009 13:34:29 +0000 (+0200)
Subject: Merge branch 'master' into mad
X-Git-Tag: 0.005005~1
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fmad;p=p5sagit%2FDevel-Declare.git

Merge branch 'master' into mad

* master:
  Version 0.005004.
  Don't define MEM_WRAP_CHECK_ if it's already there.
  Version 0.005003.
  Properly ignore dist tarballs.
  Fail hard if strip_names_and_args fails.
  Add copyright notice for stolen_chunk_of_toke.c.
  Add .gitignore.
  TODO failing tests.
  Add strip_names_and_args
  Failing tests for line number issues
  was 'assing', assuming it to be 'were passing'

Conflicts:
	stolen_chunk_of_toke.c
---

0f0084591575d1db507512268a2427d1844fea55