Merge branch 'master' of github.com:otcshare/policy-internal
authorKrisztian Litkey <kli@iki.fi>
Thu, 29 Aug 2013 23:11:30 +0000 (02:11 +0300)
committerKrisztian Litkey <kli@iki.fi>
Thu, 29 Aug 2013 23:11:30 +0000 (02:11 +0300)

Trivial merge