commit 935fa016f48d794253257e6a8e65c091593a7664
author Ezio Melotti <ezio.melotti@gmail.com> Sat Jun 25 20:30:52 2011 +0300
committer Ezio Melotti <ezio.melotti@gmail.com> Sat Jun 25 20:30:52 2011 +0300
tree e402a0e86355432121cea4f4c0f5e299960944e7
parent 5778671073b53be1d009271664c57208968a08ee
parent 2d826e8f4bca58b1406088e416305cf92d5b4d00

Merge heads.

.bzrignore

diff --git a/.bzrignore b/.bzrignore
index 15fa1e8..e893a7d 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -40,6 +40,3 @@
 .coverage
 coverage/*
 htmlcov/*
-.coverage
-coverage/*
-htmlcov/*

.gitignore

diff --git a/.gitignore b/.gitignore
index dafc9a9..63f4314 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,3 @@
 .coverage
 coverage/
 htmlcov/
-.coverage
-coverage/
-htmlcov/

.hgignore

diff --git a/.hgignore b/.hgignore
index efb013e..6a2615b 100644
--- a/.hgignore
+++ b/.hgignore
@@ -73,6 +73,3 @@
 .coverage
 coverage/
 htmlcov/
-.coverage
-coverage/
-htmlcov/