Merge branch 'master' into smaneth-devel
authorKim Nguyễn <kn@lri.fr>
Fri, 19 Oct 2012 15:48:30 +0000 (17:48 +0200)
committerKim Nguyễn <kn@lri.fr>
Fri, 19 Oct 2012 15:48:30 +0000 (17:48 +0200)
commitadbae5267917033dec93e753bbc81272d16ab218
treee32a475e4d2c3de25b3fae8a07c0a432562e2667
parent8f5b2f0c7e95245c1b7f4cc18aa137ba8e784166
parent5c37235963ddd5fbfcb6ab86c1f8ccb78d48f0f1
Merge branch 'master' into smaneth-devel