merged password change menu
authorPerttu Ahola <celeron55@gmail.com>
Sun, 22 May 2011 21:12:24 +0000 (00:12 +0300)
committerPerttu Ahola <celeron55@gmail.com>
Sun, 22 May 2011 21:12:24 +0000 (00:12 +0300)
1  2 
src/main.cpp

diff --cc src/main.cpp
Simple merge