Andrej Zverev 15f7c9edc7 - resolve conflicts after last two commits		2013-11-03 16:08:07 +00:00
..
distinfo
Makefile	- resolve conflicts after last two commits	2013-11-03 16:08:07 +00:00
pkg-descr
pkg-plist	- resolve conflicts after last two commits	2013-11-03 16:08:07 +00:00