Merge branch 'development'
commitbe52d0967fe3fd57a1e722a0c55c5f36d44cdd3e
authorLa VloZ <lavloz@hotmail.fr>
Sun, 26 Jan 2014 16:42:19 +0000 (26 17:42 +0100)
committerLa VloZ <lavloz@hotmail.fr>
Sun, 26 Jan 2014 16:42:19 +0000 (26 17:42 +0100)
treea6c46a723df12a2bd63aa8c66742f930a9a88fa1
parent8d8b9a0fdda9102d9de1389760fa468039b6b31f
parent63f113e61a909037be6e8ec809532891b849d0ad
Merge branch 'development'