Merge branch 'holidays-fixes'
authorBastien Guerry <bzg@altern.org>
Mon, 20 Aug 2012 07:08:33 +0000 (09:08 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 20 Aug 2012 07:08:33 +0000 (09:08 +0200)
commit246db4f15b31d969229e1816d70559c6d9571683
tree6420981c35f4f03bc352443cdc66da149d26474a
parent0d1d15cd897e2ab54b1ea306f8cbdf1f20f8b829
parent3a044e11f7d06807cc450d4d805155bdc8f9c1b5
Merge branch 'holidays-fixes'