wok diff mcabber/receipt @ rev 7983
Merge
author | Antoine Bodin <gokhlayeh@slitaz.org> |
---|---|
date | Mon Jan 17 18:46:01 2011 +0100 (2011-01-17) |
parents | 2c679ce49f4c |
children | 19dcddc29280 |
author | Antoine Bodin <gokhlayeh@slitaz.org> |
---|---|
date | Mon Jan 17 18:46:01 2011 +0100 (2011-01-17) |
parents | 2c679ce49f4c |
children | 19dcddc29280 |