tree db8227ab2069d4ed0d159c1f8811ac54ac04a8f5
parent b921bef5ca1855791e48d1cbf6a6e159f4e4078b
parent 44c129f6f458029be954e2d8552c9f1c25d23415
author Johan Compagner <jcompagner@gmail.com> 1350558334 +0200
committer Johan Compagner <jcompagner@gmail.com> 1350558334 +0200

Merge branch 'mylocal'