AlexVallat f442a04520 Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/Kp2aBusinessLogic/SearchDbHelper.cs
	src/keepass2android/Database.cs
	src/keepass2android/EntryActivity.cs
	src/keepass2android/EntryEditActivity.cs
	src/keepass2android/icons/DrawableFactory.cs
	src/keepass2android/search/SearchResults.cs
2013-06-19 20:31:18 +01:00
2013-02-23 17:45:00 +01:00
2013-02-23 17:45:00 +01:00
2013-02-23 17:45:00 +01:00
Description
No description provided
34 MiB
Languages
Java 59%
C# 34.1%
C 4.8%
Assembly 1.9%
C++ 0.1%