IntelliJ IDEA 14.0 <Quentin@Alphonse Update other.xml, project.default.xml
Reset to https://github.com/quentint/intellij-idea-settings-repository.git
IntelliJ IDEA 14.0 <Quentin@Alphonse Update other.xml
IntelliJ IDEA 14.0.1 <Quentin@Alphonse Update project.default.xml
IntelliJ IDEA 14.0.1 <Quentin@Alphonse Update other.xml
IntelliJ IDEA 14.0.1 <Quentin@Alphonse Update other.xml
IntelliJ IDEA 14.0.1 <Quentin@Alphonse Update webServers.xml, Quentin.xml
IntelliJ IDEA 14.0.1 <Quentin@Alphonse Update other.xml, ide.general.xml
IntelliJ IDEA 14.0.1 <Quentin@Alphonse Update other.xml
IntelliJ IDEA 14.0.1 <Quentin@Alphonse Update other.xml, filetypes.xml	Create gitignore.xml
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/filetypes.xml
	$APP_CONFIG$/ide.general.xml
	$APP_CONFIG$/webServers.xml