Merge branch 'master' into devInfo
authorGuillaume (ioguix) de Rorthais <ioguix@free.fr>
Mon, 20 Apr 2009 23:27:42 +0000 (19:27 -0400)
committerGuillaume (ioguix) de Rorthais <ioguix@free.fr>
Mon, 20 Apr 2009 23:27:42 +0000 (19:27 -0400)
commit0d5f8231212500e084530aab30aa55289dfd14ce
treee8b9a50887b3b9de47552a25ca919f9c993a560b
parentf00ea70dfc8c23b9033d64add08f3ead35bd64f7
parenta74b27a6cbf57a38e6ed95e26e2596eff9b7ece6
Merge branch 'master' into devInfo