Merge branch 'maint'
commit3f78abf0b027218378dac15e9eada81fa5b7e9a8
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 8 Nov 2014 20:40:59 +0000 (8 21:40 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 8 Nov 2014 20:40:59 +0000 (8 21:40 +0100)
tree3f63b0fb76ee859392152c29331bbf288af94be1
parentcba2f0a2a3024ae5bf71e1a12ba99778a92902a2
parent4c37a937a7a770d9493ea6776530401ff053ab56
Merge branch 'maint'