diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-16 11:26:28 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-16 11:26:28 -0300 |
commit | ebef5099cd5f2ec0686b8f46d389c43ea5a53cac (patch) | |
tree | 88cb12bf7b9ecc8545122eeeba8d45797f17e239 /~fauno/haskell-citeproc-hs | |
parent | 5f5cc752e0a87d0ccd031eaf01ca2b63f303e00c (diff) | |
parent | ac25f0b5aaf7aff394a8df695be995ec8463e264 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
libre/thunderbird-libre/PKGBUILD
Diffstat (limited to '~fauno/haskell-citeproc-hs')
0 files changed, 0 insertions, 0 deletions