Merge remote-tracking branch 'tarleb/sieve'
authorJulien Danjou <julien@danjou.info>
Fri, 14 Jun 2013 07:28:20 +0000 (09:28 +0200)
committerJulien Danjou <julien@danjou.info>
Fri, 14 Jun 2013 07:28:20 +0000 (09:28 +0200)
commitc77e2d8dd9ebe9b2496d0ca06e63fdbfc8f11f37
treeee6b174c8320036736ed0c6303934ae2b729c891
parent4a8b90d0d6c0ca1555511d26772e62dea8862f19
parent427784ba8ef52bb12ac358c6b9f1ddee254b27fb
Merge remote-tracking branch 'tarleb/sieve'

Signed-off-by: Julien Danjou <julien@danjou.info>
Conflicts:
lisp/ChangeLog
lisp/ChangeLog