merge with master
[framework/security/security-server.git] / src / client / security-server-client.c
2013-03-15 Jinkun Jangmerge with master