Merge remote-tracking branch 'origin/master' into wordpress
authorYingjie Xu <yxu@nexedi.com>
Wed, 9 May 2012 12:43:59 +0000 (14:43 +0200)
committerYingjie Xu <yxu@nexedi.com>
Wed, 9 May 2012 12:43:59 +0000 (14:43 +0200)
commit7db660bada354bbbef944c500ca3b27d2a7d611a
tree9a57dddeb6d6fd637ab220c964fc1405c6d944bc
parent6d49e82d9571593c88bc0114449968218b9ff068
parent987ab29bba8809117007534d3c6ec8073e57f548
Merge remote-tracking branch 'origin/master' into wordpress
stack/lamp/buildout.cfg