Merge branch 'nilovna' into test
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Mon, 20 Feb 2012 22:01:59 +0000 (17:01 -0500)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Mon, 20 Feb 2012 22:01:59 +0000 (17:01 -0500)
commit905a6544ddbe926f511189eebe68147d66173330
tree3d920ded7559940bb39bd92b7954481eb23e142c
parent693c606b482de8949655b2d7167018c50305402c
parent3a91ea07ad1aca4fec88b8ea3f830de6f87964dd
Merge branch 'nilovna' into test

Conflicts:
buildout.cfg