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