Baptiste Daroussin ba11c55ba7 Update to 1.5.99.11 ... Changes: - Fix 3 way merge - Properly apply credentials on merged files (@config)		2015-08-30 18:23:02 +00:00
..
files
distinfo	Update to 1.5.99.11	2015-08-30 18:23:02 +00:00
Makefile	Update to 1.5.99.11	2015-08-30 18:23:02 +00:00
pkg-descr
pkg-message
pkg-plist