Merge commit 'refs/merge-requests/15' of git://gitorious.org/f-droid/fdroiddata into merge-requests/15

Conflicts:
	metadata/in.shick.lockpatterngenerator.txt

metadata/com.googlecode.gtalksms.txt

@@ -0,0 +1,20 @@
+#talkmyphone project as been merged into this.probably remove that from repo.
+#the reference to admob in the code is because the app in the market is ad-supported with full features. there is another app which is just a key to disable ads
+
+Category:Phone & SMS
+License:GPLv3
+Web Site:https://code.google.com/p/gtalksms/w/list
+Source Code:https://code.google.com/p/gtalksms/source/list
+Issue Tracker:https://code.google.com/p/gtalksms/issues/list
+Donate:http://flattr.com/thing/130193/GTalkSMS
+Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=WQDV6S67WAC7A&lc=US&item_name=GTalkSMS&item_number=WEB&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted
+
+Summary:Control your phone via GTalk/XMPP
+description:Send/receive SMS, make calls, locate your phone via GPS, activate WLAN or Bluetooth, etc. It can be useful for those who prefer typing sms on a real keyboard. The app also notifies you about new "events" on the phone, like a new text message (SMS) or an incoming call. Think of it as an remote control for your android phone via GTalk/XMPP that informs you about recent events on your smartphone. 
+.
+
+Repo Type:hg
+Repo:https://code.google.com/p/gtalksms/
+
+Build Version:Holo β,58,b931e74fd7cc
+#there is a stable version written for gingerbread also

metadata/com.marv42.ebt.newnote.txt

@@ -0,0 +1,23 @@
+Category:Games
+License:GPLv3
+Web Site:http://www.eurobilltracker.com/
+Source Code:http://code.google.com/p/ebt-new-note/source/checkout
+Issue Tracker:http://code.google.com/p/ebt-new-note/issues/list
+Donate:
+
+Summary:Submit Euro bill notes to Euro Bill Tracker
+Description:
+*This software is still under development.*
+Features:
+* Submit note information in the background
+* Note data representation: provide editing, show note in browser
+* Get postal code, country and city from location information (GPS or Network Location), prefer location information depending on accuracy and up-to-dateness
+* Provide an EBT keyboard: no switching between numbers and letters necessary
+* OCR of serial number (experimental)
+* Location based comment suggestions
+.
+
+Repo Type:git-svn
+Repo:http://ebt-new-note.googlecode.com/svn
+
+Build Version:0.0.64,1,r131

metadata/in.shick.lockpatterngenerator.txt

@@ -1,5 +1,5 @@
 Category:System
-License:GPLv3
+License:GPLv3+
 Web Site:http://shick.in/android/
 Source Code:https://github.com/zagaberoo/lockpatterngenerator
 Issue Tracker:https://github.com/zagaberoo/lockpatterngenerator/issues

metadata/no.rkkc.bysykkel.txt

@@ -0,0 +1,22 @@
+Category:Navigation
+License:GPLv3
+Web Site:http://www.kind-kristiansen.no/projects/bysyklist-oslo
+Source Code:https://gitorious.org/bysyklist
+Issue Tracker:http://rogerkk.lighthouseapp.com/projects/53437-bysyklist-oslo
+Donate:
+
+Summary:Helps you find ready bikes or locks for ClearChannels city bike project in Oslo (not affiliated with ClearChannel)
+Description:Bysyklist Oslo helps you find racks with ready bikes or docks for ClearChannels city bike (bysykkel) project in Oslo, Norway.
+
+Features:
+* Map, with your location and rack status
+* Favorites
+* Desktop shortcuts for finding nearest bike or free dock with one single push of a button.
+
+.
+
+Repo Type:git
+Repo:git://gitorious.org/bysyklist/bysyklist.git
+
+Build Version:1.1.2,25,1a6785f288967205bd347ec7af07bc8a525b473b
+

metadata/org.madore.android.unicodeMap.txt

@@ -0,0 +1,24 @@
+Category:Office
+License:Public Domain
+Web Site:http://www.madore.org/~david/programs/UnicodeMap.html
+Source Code:http://git.madore.org/?p=android/UnicodeMap.git;a=summary
+Issue Tracker:david+www@madore.org
+Donate:
+
+Summary:Browse and copy Unicode characters
+Description:
+UnicodeMap lets you browse Unicode characters by range and search for them by name, display them (when Android has the font) and copy them to the clipboard. It can also decode a string of Unicode characters to names.
+
+I wrote this because Android doesn't offer a way to enter exotic Unicode characters (in the en-US locale, which I use, it is limited to accented Latin characters). Unfortunately it isn't very good as an input method. This app is just the list of Unicode characters, arranged by block: you can browse through them, enter them in a dedicated text field, and copy that field to the clipboard (it works a bit the way Gucharmap does). There is also a primitive search feature (to search on the character name). Of course, Android will only properly display a minuscule fraction of the characters, but those that are not properly displayed still “work” in the sense that you can copy them around or whatever.
+
+This is a very basic and limited program, and not much data is available (essentially, only the character name, its code point and its general category). The list of characters, on the other hand, is complete: the latest version has the full Unicode 6.1 character set (all 110 181 of them). In particular, the program is not limited to the first plane of Unicode (aka, 65536 codepoints): you can copy-paste cuneiform if you like.
+.
+
+Repo Type:git
+Repo:git://git.madore.org/android/UnicodeMap.git
+
+Build Version:0.0.4,4,47f5265e
+
+current version:0.0.4
+current version code:4
+

metadata/org.witness.sscphase1.txt

@@ -0,0 +1,20 @@
+Category:Multimedia
+License:GPLv3
+Web Site:https://guardianproject.info/apps/securecam/
+Source Code:https://github.com/guardianproject/SecureSmartCam
+Issue Tracker:https://github.com/guardianproject/SecureSmartCam/issues
+Donate:http://witness.org/Donate
+
+Summary:Keep it simple, keep it safe
+Description:
+Anonymize your photos and videos
+.
+
+Repo Type:git
+Repo:git://github.com/guardianproject/SecureSmartCam.git
+
+Build Version:1.0,1,7b55a4fc2
+
+Update Check Mode:RepoManifest
+Current Version:1.0
+Current Version Code:1