diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-18 16:54:29 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-18 16:54:29 +0200 |
| commit | 6d3d853af3b9042559c2d86a7e3907f97921fb28 (patch) | |
| tree | c792505884d2ffee7dee3e9060637acfe25a7021 /community/prosody/ChangeLog | |
| parent | 5880798304726de24b4c520a62a15b3090950c08 (diff) | |
| parent | 2f104ecf78d6a93ba8d67273b76364cb1365a6cf (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/soprano/PKGBUILD
extra/xfce4-sensors-plugin/PKGBUILD
Diffstat (limited to 'community/prosody/ChangeLog')
0 files changed, 0 insertions, 0 deletions