[filezilla/f13/master: 25/25] Initial pseudo merge for dist-git setup

[Nicolas Chauvet]

commit e1fa99d1d058fe162f106518ded7bf154d3cf9d7
Merge: 89c4b29 e535f77
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Wed Jan 12 12:24:57 2011 +0100

    Initial pseudo merge for dist-git setup

---