Merge branch 'frontend'
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 29 Mar 2013 14:36:06 +0000 (15:36 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 29 Mar 2013 14:36:06 +0000 (15:36 +0100)
commitbc156ba1dbfc8b15d982b23875e801bc7fc68664
tree9c4a3925b902335482567569fdb2fa56a6dc44eb
parentce1afa34f83bbc54341b2a635c6a19d6fe977ef4
parent890518157fd4c011c5ece2bea25d72e964e46f4f
Merge branch 'frontend'