Merge branch 'master' of github.com:otcshare/policy-internal
authorKrisztian Litkey <kli@iki.fi>
Tue, 15 Oct 2013 11:14:47 +0000 (14:14 +0300)
committerKrisztian Litkey <kli@iki.fi>
Tue, 15 Oct 2013 11:14:47 +0000 (14:14 +0300)

Trivial merge