Merge branch 'master' into erp5
authorŁukasz Nowak <luke@nexedi.com>
Fri, 23 Sep 2011 07:52:15 +0000 (09:52 +0200)
committerŁukasz Nowak <luke@nexedi.com>
Fri, 23 Sep 2011 07:52:15 +0000 (09:52 +0200)
commitf492604ed83e0f94930a712e7a364920f1e87f91
treefc8f83196ca09bc0274aeef0542eeb68e24faa7c
parent478ef9e73ec622a2088be6b1937183d4960e9562
parente8bc2cbc8dd7c66aa529d7743e096eb06e4460de
Merge branch 'master' into erp5

Conflicts:
component/apache/buildout.cfg
Avoid using older version of apache from master.

component/libreoffice-bin/buildout.cfg
Drop changes which problem addressed shall be done by releasing erp5 to master.

component/stunnel/buildout.cfg
Drop changes which problem addressed shall be done by releasing erp5 to master.

  component/xorg/buildout.cfg
Remove not needed garbage from master.

slapos/recipe/erp5/__init__.py
Avoid cleanup removal by master.

slapos/recipe/erp5/template/logrotate_entry.in
Remove not needed garbage from master.

Manually found wrong changes on master:

  component/noVNC/buildout.cfg
Use head instead of pinned version.

  stack/erp5.cfg
Drop changes which problem addressed shall be done by releasing erp5 to master.
component/apache/buildout.cfg
slapos/recipe/librecipe/__init__.py