Merge branch 'master' into yaml
commit1a1f05c2833e36ca7719d07e38d6ad200481cd6d
authorMarc-Olivier Barre <marco@marcochapeau.org>
Wed, 6 Jan 2010 13:59:34 +0000 (6 14:59 +0100)
committerMarc-Olivier Barre <marco@marcochapeau.org>
Wed, 6 Jan 2010 13:59:34 +0000 (6 14:59 +0100)
tree36861ea09ea94460fb65bac2258ce466b9286df0
parentcce636f6c5f8ef03e84003e081055053ad0a87de
parentb04be4879a3089222cde063169f33074b5048092
Merge branch 'master' into yaml
ladiconf