Merge branch 'maint'
commit824e95540d34cf9f8d00f4ac81c592e66ae2b345
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 12 May 2013 07:57:42 +0000 (12 09:57 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 12 May 2013 07:57:42 +0000 (12 09:57 +0200)
treeb042ec79f8934aeebd018fa9bdf12f3e4767f1af
parent8bbfdbe3575f247e53a7f7cdeb1d586ec6e4bfb9
parentbffc94c0b19481199691d302a79acc233be334ef
Merge branch 'maint'