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)
commit1c90f9fc2eba43be71f9d49dad75c5d0514d4e50
tree63c1116ff43936475874b54d171c7e08556d54ee
parent158b054e72582005d895f1ed0e1cb0c9b22a8e57
parent7efe89ff584b2c0338dcede4c1e08504d0158780
Merge pull request #13 from Bahamada/upstream_merge

Upstream merge