From: Rafael Gaitán Linares <rgaitan@sparrow-2.local>
Date: Mon, 7 Dec 2009 01:40:58 +0000 (+0100)
Subject: Merge branch 'master' of git@github.com:slackito/fov120
X-Git-Url: http://slack.codemaniacs.com/git/?a=commitdiff_plain;h=30729856bdef6ebc26e8ff36b1634fef94e10f13;p=fov120.git

Merge branch 'master' of git@github.com:slackito/fov120
---

30729856bdef6ebc26e8ff36b1634fef94e10f13