merge lamp-mayoro into master
authorMayoro Diagne <mayoro@nexedi.com>
Thu, 13 Sep 2012 10:13:59 +0000 (10:13 +0000)
committerMayoro Diagne <mayoro@nexedi.com>
Thu, 13 Sep 2012 10:13:59 +0000 (10:13 +0000)
commitb06c7abdabf8a0fae270efe4b8cc212aec7f574d
treeee702a17af992370cfb1384c212db5e1517a9d9e
parented0005ca444090e1deb239f14ef038f5f68cc534
parent55eb708db3147909d83e2c5bc4c7c5d93c3020fb
merge lamp-mayoro into master
software/chamilo/instance.cfg