Merge branch 'master' into erp5
[slapos.git] / component / libiconv /
2011-11-10 Łukasz NowakMerge branch 'master' into erp5
2011-11-10 Cédric de Saint... Merge branch 'kvm'. Lot of conflicts.
2011-11-07 Łukasz NowakMerge branch 'master' into slapos slapos-0.57
2011-10-24 Cédric de Saint... Merge branch 'master' into webrunner
2011-10-18 Cédric de Saint... Merge branch 'lamp'
2011-10-18 Alain TakoudjouAdd all major PHP software to SlapOS.