Conflicts: trunk/TMP/st/elementary/.gitignore SVN revision: 51935
SVN revision: 51715
SVN revision: 51626