diff options
author | André Fabian Silva Delgado <andre@pc-01.localdomain> | 2012-04-14 15:40:13 -0300 |
---|---|---|
committer | André Fabian Silva Delgado <andre@pc-01.localdomain> | 2012-04-14 15:40:13 -0300 |
commit | a6b8eb42c128cd9c15c1f2ad0058e727d00fcf91 (patch) | |
tree | 15f7d0a5cf0359effbd3fc22e6592be628371b77 /social/asterisk | |
parent | 8df0f600e8af6ec882fdc19ffff4ef823b7747b3 (diff) |
mariadb-5.5.23-2: fixing conflicts issues
Diffstat (limited to 'social/asterisk')
0 files changed, 0 insertions, 0 deletions