diff options
| author | Julien Valroff <julien@kirya.net> | 2011-04-16 16:47:41 +0200 |
|---|---|---|
| committer | Julien Valroff <julien@kirya.net> | 2011-04-16 16:47:41 +0200 |
| commit | d43e203266b3d61dac1499351ec20dc57c1728b2 (patch) | |
| tree | d0ed723b249d1ccb0df2c8b1ea0009d1e7390116 /debian/rules | |
| parent | 1d2747f5ec6d056b394335caf5e53598635fbec1 (diff) | |
| parent | 7dd4f231f394157a6ebd1504808e86dc335f6841 (diff) | |
Merge branch 'master' into squeeze-backportsdebian/1.14-9_bpo60+1
Conflicts:
debian/changelog
Diffstat (limited to 'debian/rules')
0 files changed, 0 insertions, 0 deletions