diff options
author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-04-12 13:53:12 -0300 |
---|---|---|
committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-04-12 13:53:12 -0300 |
commit | a0a5078595f0fc0826387582bb0e76cb52908518 (patch) | |
tree | 8d8155b80f925068f69ee4aea606a9f24d890aeb /libre/metalog | |
parent | a19cbf2e94f0c06adafec2a9ff0d1d619881cc83 (diff) | |
parent | 96df1bacd54ae9d919c62f4348cc011c961f923e (diff) |
Merge branch 'master' of ssh://gparabola/abslibre
Conflicts:
libre/file-roller-libre/PKGBUILD
Diffstat (limited to 'libre/metalog')
0 files changed, 0 insertions, 0 deletions