Merge branch 'master' of https://github.com/otcshare/policy-internal
authorJanos Kovacs <jankovac503@gmail.com>
Fri, 1 Feb 2013 20:17:26 +0000 (22:17 +0200)
committerJanos Kovacs <jankovac503@gmail.com>
Fri, 1 Feb 2013 20:17:26 +0000 (22:17 +0200)

Trivial merge