Merge remote-tracking branch 'elky/master' master
authorChristian Weiske <cweiske@cweiske.de>
Wed, 19 Sep 2012 22:15:31 +0000 (00:15 +0200)
committerChristian Weiske <cweiske@cweiske.de>
Wed, 19 Sep 2012 22:15:31 +0000 (00:15 +0200)
commit7c61ccca64d4698303abc4d38f2bb3aafe387560
tree3c00b0176501d1357e6c7e3ff1a04c5493917848
parentfd67be9a69b628e868ff40a543f20ff3723f02e8
parent7b95aa043be6ccd398de203a197c95f05e3a9141
Merge remote-tracking branch 'elky/master'