Merge branch 'devel' of https://github.com/salsifis/msysgit
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Mon, 3 Dec 2012 22:23:51 +0000 (16:23 -0600)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Mon, 3 Dec 2012 22:23:51 +0000 (16:23 -0600)
commit947ccf6973a5be4795b3c411fe3727abad51d75d
treec39c3b772c332a3298241afb8fbe468b1788ac7e
parent6bf64a43543014be9f055abcf291b46a28272851
parent759a59f67bfcb7cf1fb11f289d04398eb78de908
Merge branch 'devel' of https://github.com/salsifis/msysgit

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Conflicts:
etc/profile
etc/profile