Merge remote-tracking branch 'origin/2.0'
authorOlivier Goffart <ogoffart@woboq.com>
Thu, 29 Oct 2015 11:44:28 +0000 (12:44 +0100)
committerOlivier Goffart <ogoffart@woboq.com>
Thu, 29 Oct 2015 11:44:28 +0000 (12:44 +0100)
1  2 
ChangeLog
src/cmd/cmd.cpp

diff --cc ChangeLog
Simple merge
diff --cc src/cmd/cmd.cpp
Simple merge