Merge branch 'master' into dev
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Thu, 18 Aug 2011 14:24:57 +0000 (10:24 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Thu, 18 Aug 2011 14:24:57 +0000 (10:24 -0400)
commit54d6b36409b97465e7e3278e3e3918cb240904c7
tree655bad135fcad3e1103f6eb777c468c2b5cc5633
parente34ba0981e6597d5db8ea8505d4ad0d0c7823b1b
parent9ab4727de826a60b2e5c61839687456eab5bb500
Merge branch 'master' into dev