diff options
| author | Manoj Srivastava <srivasta@debian.org> | 2008-11-25 18:16:26 -0600 |
|---|---|---|
| committer | Manoj Srivastava <srivasta@debian.org> | 2008-11-25 19:41:18 -0600 |
| commit | 6e7eb04f1c2263593eb7e160d5d288ad2e7076d4 (patch) | |
| tree | d9f1b4714bb5b97a54baafc962d5e2ed8f0961e1 | |
| parent | ead18ebac6dc948353e56d3707f95384683c148e (diff) | |
| parent | 2fb43ac7bbe73747d77454078f359888ab0a320b (diff) | |
| parent | 9a759673f29d628f0cf171e7b5e9e86e4c37f706 (diff) | |
Merge branches 'topic--unsafe-symlink' and 'topic--debian'
Also, update the revision to match the actual svn revision.