Merge pull request #13 from Bahamada/upstream_merge
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Mon, 27 Jun 2011 13:56:26 +0000 (06:56 -0700)
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Mon, 27 Jun 2011 13:56:26 +0000 (06:56 -0700)
commitf37a3a84fafb91bcfc109fed95aa6d42726f1bf7
treecde1e5f47f191beb4a9cefcd87872aef53b5fcec
parente261cc9e8fa67c9020fa0a82bd1a7041ecd351a0
parent13cf5425db613dc0a4323c87a4988bb18fb87aca
Merge pull request #13 from Bahamada/upstream_merge

Upstream merge