diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-01-10 17:54:45 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-01-10 17:54:45 -0300 |
| commit | 201e906ce628e92e00276f89534317ac5496e956 (patch) | |
| tree | 3f112195cc332fd523622e75b3f13a94548a63f8 /social/diaspora-git/diaspora.bashrc | |
| parent | 0e2a2f452ec5849dcdfefd7a8817640a572b98a8 (diff) | |
| parent | dae24b9bff18ea229c727ad885e845c9de0b42a3 (diff) | |
Merge branch 'master' of ssh://gparabola/abslibre
Conflicts:
cross/cross-mips64el-unknown-linux-gnu-gcc/PKGBUILD
Diffstat (limited to 'social/diaspora-git/diaspora.bashrc')
0 files changed, 0 insertions, 0 deletions