Merge remote branch 'origin/misi/ua-profile'
authorMészáros Mihály <misi@niif.hu>
Thu, 17 Nov 2011 13:02:56 +0000 (14:02 +0100)
committerMészáros Mihály <misi@niif.hu>
Thu, 17 Nov 2011 13:02:56 +0000 (14:02 +0100)
commitcd356bc0ffe4dc5ca75c07a230cfc2cbd3ddd852
treef5f463c9420db6b0359fa4d9c62eda8673b610a2
parent2396dde7230e04f853e6936cfff9059661c55635
parentd3a2b22db7e8c7c77f8bdf8af25ff23fe1316076
Merge remote branch 'origin/misi/ua-profile'

* origin/misi/ua-profile:
  modules_k/presence_profile: new modul for basic ua-profile event support
  parser: added ua-profile event type
Makefile