Merge branch 'alexis/various-fixes' into wip
authorJean Privat <jean@pryen.org>
Tue, 25 Jan 2011 02:35:09 +0000 (21:35 -0500)
committerJean Privat <jean@pryen.org>
Tue, 25 Jan 2011 02:35:09 +0000 (21:35 -0500)
commit6d65fbac14f2d8d1c13217ab5a79aba3b9117ea3
tree0dd6066f10859c43d6699776c2d5b9d123d61aa0
parentf860b2fb89e358b58b2c875676d3c360e232e449
parent8f1a18a59990914b098e7406068670e2eab2ac5b
Merge branch 'alexis/various-fixes' into wip