Merge branch 'upstream'
authorSven Hoexter <sven@stormbind.net>
Mon, 17 Jan 2011 15:24:13 +0000 (16:24 +0100)
committerSven Hoexter <sven@stormbind.net>
Mon, 17 Jan 2011 15:24:13 +0000 (16:24 +0100)
commita7d96890464a49f7bc2d9748a2fd9ab370409801
tree1a8f829d23a05a0edd9f8adcf5fb28007a63713e
parentc11648e53e54c87a10bb961016304b7a213099be
parentb47a140e1d8fa10b34c244d077b2a3a7f36c7ff8
Merge branch 'upstream'