Merge branch 'holidays-fixes'
commit3ca3b1e6935aec0aadc1727314eab15168ff4392
authorBastien Guerry <bzg@altern.org>
Sun, 19 Aug 2012 08:16:19 +0000 (19 10:16 +0200)
committerBastien Guerry <bzg@altern.org>
Sun, 19 Aug 2012 08:16:19 +0000 (19 10:16 +0200)
tree63b1dffd3926dacbe5633d683cd79cf55908be1c
parent3a8969edbcea3f053c0bd936fafadf1a01a2aa16
parent6309dcae6b9fccd8e3cca13ab2c9ff21b361dac2
Merge branch 'holidays-fixes'