diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-12-04 03:47:29 (GMT) |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-12-04 03:47:29 (GMT) |
| commit | 1c08feddc73126da1eae9d63ff47171f46b5c6bc (patch) | |
| tree | f6e91f82804780dbfe740f5aeb2df413c445fa9c | |
| parent | 25f77e0a81a26737ffb09cf415106db4af63a1c9 (diff) | |
| parent | 1d1971218144a06a2121db71ac7f297e3dca4627 (diff) | |
Merge branch 'master' of ssh://js@git.debian.org/git/collab-maint/sugar-web-activitydebian/101-1
Conflicts (manually resolved):
debian/cdbs/1/class/python-sugar.mk
0 files changed, 0 insertions, 0 deletions