Florian Smeets c12f359886 Update CONFLCITS after the addition of percona55-* and mariadb55-* ...

Approved by:	maintainer

2013-01-17 16:43:07 +00:00

..

files

Update to 5.5.29 release.

2012-12-21 21:53:09 +00:00

Makefile

Update CONFLCITS after the addition of percona55-* and mariadb55-*

2013-01-17 16:43:07 +00:00

pkg-plist

…