1. 14 Oct, 2011 1 commit
    • Romain Courteaud's avatar
      Merge branch 'master' into erp5 · 53c5932d
      Romain Courteaud authored
      Conflicts:
      	component/apache/buildout.cfg
      	component/groonga/buildout.cfg
      	component/imagemagick/buildout.cfg
      	component/mysql-5.1/buildout.cfg
      	component/ncurses/buildout.cfg
      	slapos/recipe/erp5/template/haproxy.cfg.in
      	software/erp5/software.cfg
      	software/vifib/software.cfg
      	stack/erp5.cfg
      53c5932d
  2. 13 Oct, 2011 4 commits
  3. 12 Oct, 2011 6 commits
  4. 10 Oct, 2011 3 commits
  5. 08 Oct, 2011 1 commit
  6. 07 Oct, 2011 6 commits
  7. 06 Oct, 2011 2 commits
  8. 05 Oct, 2011 8 commits
  9. 04 Oct, 2011 2 commits
  10. 03 Oct, 2011 4 commits
  11. 28 Sep, 2011 3 commits