Merge branch 'master' into remotefork
authorChristian Weiske <cweiske@cweiske.de>
Wed, 19 Sep 2012 17:09:10 +0000 (19:09 +0200)
committerChristian Weiske <cweiske@cweiske.de>
Wed, 19 Sep 2012 17:09:10 +0000 (19:09 +0200)
commit11c020441ee7ddf53fcaec4250c0a408fa18d0be
treeaa2980c343252c7bd7a134ac0b8b15f53f9f12f6
parent1797cbc2b010552b54e9d070820fa9cbc9ce3af9
parent4316861c45f6938303695676df9de5afd7fc3b0b
Merge branch 'master' into remotefork