Surt/Granada — pull request #21 by Surt (2013-10-23 07:06:45+00:00)
Title: Re-Merge

Don't know what happend here.