Merge branch 'maint'
commit3799de774ef5cbfca154df5c90488ba49279641c
authorNicolas Goaziou <n.goaziou@gmail.com>
Fri, 26 Apr 2013 13:54:03 +0000 (26 15:54 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Fri, 26 Apr 2013 13:54:03 +0000 (26 15:54 +0200)
tree925ab6741bbebd2f45b4a1d91c81ea1b471ae914
parent74fda6f64dde60de875dcd9c11fb7df385fa19bb
parenteba04bfb3c9c498c6ff25a26f29f0fca4080bb62
Merge branch 'maint'