Merge remote-tracking branch 'origin/pulse'
authorŁukasz Nowak <luke@nexedi.com>
Tue, 24 Jan 2012 16:37:11 +0000 (17:37 +0100)
committerŁukasz Nowak <luke@nexedi.com>
Tue, 24 Jan 2012 16:37:11 +0000 (17:37 +0100)
commitb24fc0f460d998f991464ed8029b79faf151e524
treeaa7da405040ff2e660d99bf2d824f5df3bc84540
parent9d3d5182af49d0d42053073f79e5f33cf7220d44
parente592572d1205ccbaffc126b12cd0a7e5a0e31363
Merge remote-tracking branch 'origin/pulse'

Conflicts:
component/apache-php/buildout.cfg

Master version of component/apache-php/buildout.cfg has been kept, as it
provides same functionality but in more updated way.