Sergey Solovyev c772a4e429 Merge remote-tracking branch 'origin/master' ... Conflicts: android-app-core/res/values-ru/text_about.xml android-app-core/res/values-ru/text_wizard.xml android-app-core/res/values/text_about.xml android-app-core/res/values/text_wizard.xml pom.xml		2013-07-03 00:08:50 +04:00
..
main	Merge remote-tracking branch 'origin/master'	2013-07-03 00:08:50 +04:00
test	tests fixed	2013-07-01 13:15:01 +04:00