summaryrefslogtreecommitdiff
path: root/social
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-26 11:56:16 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-26 11:56:16 -0300
commit8bdddf0c9d5b345120c8d2514131623ba1dcb13a (patch)
treec295c03679e64653c44785e6fed1d3e8d0aacabd /social
parentef3f5c5ef898f48c463c4dbe28a9367201437f34 (diff)
parentff20b83d60041f745a579e10770706b0b49d5617 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: core/systemd/PKGBUILD extra/physfs/PKGBUILD
Diffstat (limited to 'social')
0 files changed, 0 insertions, 0 deletions