[code-editor: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/code-editor

[Ilyes Gouta]

commit a286034ee99f3e75e57ee5a11e298e8bc84854a1
Merge: e1e1321 a5cfaeb
Author: Ilyes Gouta <ilyes.gouta at gmail.com>
Date:   Sat Nov 5 19:57:46 2011 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/code-editor
    
    Conflicts:
    	sources

---