Merge commit 'origin/locationlistview' into friendlist_filtering_text_field
authorSami Rämö <sami.ramo@ixonos.com>
Mon, 16 Aug 2010 13:24:30 +0000 (16:24 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Mon, 16 Aug 2010 13:24:30 +0000 (16:24 +0300)
commit0b0a4ae89e7e92714830d6f13f7c5a96ee579cf3
tree245bc9dcd420c6e989a3c4cc4e3f45ff04bd1195
parentb9e210ea869151849eb681ee170fca17ae5e305d
parent21e8f923c4bf699c12c5f5aea5243e42fa2706eb
Merge commit 'origin/locationlistview' into friendlist_filtering_text_field