Merge branch 'master' into remotefork
authorChristian Weiske <cweiske@cweiske.de>
Wed, 19 Sep 2012 17:12:07 +0000 (19:12 +0200)
committerChristian Weiske <cweiske@cweiske.de>
Wed, 19 Sep 2012 17:12:07 +0000 (19:12 +0200)
commite8151ad24cb9f4951ea1f29f5878248e584b8372
tree8fa45bb1baa6dea1a199d870b88be02166c2c19c
parent11c020441ee7ddf53fcaec4250c0a408fa18d0be
parent13889267c83c2f7a747120a91352bae4d605aa3e
Merge branch 'master' into remotefork