Merge branch 'testing'0.6
commitf736919e4df98edd21f64261881ecca5a650e88c
authorT(A)ILS developers <amnesia@boum.org>
Fri, 22 Oct 2010 06:09:52 +0000 (22 08:09 +0200)
committerT(A)ILS developers <amnesia@boum.org>
Fri, 22 Oct 2010 06:09:52 +0000 (22 08:09 +0200)
treeb7d6537e098abf0027a812c5266bb2920f7045d6
parent0875d78502806f1b465243cc24e7526bbfd8e0b4
parent8756cb41abcb2270384818648e24884c44968167
Merge branch 'testing'