Merge branch 'master' of gitorious.org:lorea/html5
authorSem <sembrestels@riseup.net>
Wed, 20 Feb 2013 23:53:20 +0000 (00:53 +0100)
committerSem <sembrestels@riseup.net>
Wed, 20 Feb 2013 23:53:20 +0000 (00:53 +0100)
commit210f4fbdd2cb89d56167b0a367de991bfcd44acc
treea348374fc55b497806d9b65a05357fe693dfeff1
parent9cffddf0969ee63002c2a6c3574bdc796849e9ee
parentb56c888650b1bfc127f9a8314a33a136eb752e66
Merge branch 'master' of gitorious.org:lorea/html5