Merge branch 'maarch'
authorMarco Mariani <marco.mariani@nexedi.com>
Fri, 15 Mar 2013 16:08:06 +0000 (17:08 +0100)
committerMarco Mariani <marco.mariani@nexedi.com>
Fri, 15 Mar 2013 16:08:06 +0000 (17:08 +0100)
commit9836477064df690789e6788bce68470c2f464784
treed0c5a6f00e1626ab42e6aa00c0894efca15bf46c
parent585b292afd967c3077cbb8a898ef2231b48f22d4
parent1d832b8fa89149c651831985d5dd3fb27a2091fb
Merge branch 'maarch'

Conflicts:
stack/lapp/buildout.cfg