Merge branch 'dev'
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Thu, 8 Mar 2012 21:04:15 +0000 (16:04 -0500)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Thu, 8 Mar 2012 21:04:15 +0000 (16:04 -0500)
commit30aa82ea0546a11a6d092dfec179bf6cefd7959d
tree7e76ccda4d6bf3fac9249e7cc81421e4715e10fe
parent36f08e3b6f78878da18f2ecec061f392ad136129
parenta12ddd5234d2075abeadebb22877d3b395607772
Merge branch 'dev'