diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-08 10:56:37 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-08 10:56:37 -0300 |
| commit | 8b82a3250aa4e181b97e7faeb055a00e718bdadb (patch) | |
| tree | 9f1af6b49d55bbcc847ec8ebed1f8ae2f197e461 /extra/telepathy-haze | |
| parent | e0981df8c5fce1353e1499a5085e27f92afddcea (diff) | |
| parent | 665308e50fd95e984da057ab8ddb6505b596b841 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/lxsession-lite/PKGBUILD
community/synce-odccm/PKGBUILD
extra/cyrus-sasl-plugins/PKGBUILD
Diffstat (limited to 'extra/telepathy-haze')
0 files changed, 0 insertions, 0 deletions