Permalink
Browse files

Merge remote-tracking branch 'dzil-base/master'

Conflicts:
	.gitignore
	dist.ini

Signed-off-by: Caleb Cushing <xenoterracide@gmail.com>
  • Loading branch information...
2 parents 6061ef2 + 275f943 commit 89ea6813da279ff74f87b0628db492fc1451e526 @xenoterracide committed Jun 5, 2011
Showing with 1 addition and 0 deletions.
  1. +1 −0 dist.ini
View
@@ -58,3 +58,4 @@ copyright_year = 2011
version_regexp = ^(.+)$
[CheckChangesHasContent]
+[Clean]

0 comments on commit 89ea681

Please sign in to comment.