Merge branch 'master' of https://github.com/otcshare/policy-internal
authorJanos Kovacs <jankovac503@gmail.com>
Thu, 14 Feb 2013 02:04:01 +0000 (04:04 +0200)
committerJanos Kovacs <jankovac503@gmail.com>
Thu, 14 Feb 2013 02:04:01 +0000 (04:04 +0200)
commit8599055b6c3d7a1047aff204d93570566f349431
tree98171e202f0c42e68eb1c6ed9a08ea153203e171
parente7b3e9a8c2ca44763686363a267336b914ebcf89
parentab176ec57bebb9e07ab3b38af0b17af20fc9651f
Merge branch 'master' of https://github.com/otcshare/policy-internal
src/Makefile.am
src/daemon/murphy.lua