diff options
author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-09-28 01:43:09 -0500 |
---|---|---|
committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-09-28 01:43:09 -0500 |
commit | 6987643a3fc70f8ecdccfe1672871c275465cb7d (patch) | |
tree | 44687856a099fb1af90ef538c4fe42928c3ee1bb /testing/postgresql/postgresql.pam | |
parent | eb0033f825dcf30643fa8e2ac8fe2788f7e3207c (diff) | |
parent | 60e119a0f3297314f4bcd2b2b821eccd28992cd6 (diff) |
Merge branch 'master' of gitpar:abslibre-mips64el
Conflicts:
extra/lyx/PKGBUILD
Diffstat (limited to 'testing/postgresql/postgresql.pam')
0 files changed, 0 insertions, 0 deletions