Merge branch 'master' of github.com:otcshare/policy-internal
authorKrisztian Litkey <krisztian.litkey@intel.com>
Wed, 29 Jan 2014 13:42:38 +0000 (15:42 +0200)
committerKrisztian Litkey <krisztian.litkey@intel.com>
Wed, 29 Jan 2014 13:42:38 +0000 (15:42 +0200)

Trivial merge