Merge branch 'metadata' into mooseish-types
authorLukas Mai <l.mai@web.de>
Mon, 19 Nov 2012 19:25:59 +0000 (20:25 +0100)
committerLukas Mai <l.mai@web.de>
Mon, 19 Nov 2012 19:25:59 +0000 (20:25 +0100)
commit69275f98dadcbffaa40af364c5288036c18dea1b
treeee16e9d3ecbe94518a56c6e4b6e6c3769a56c634
parentbd040be664b763fb8e5a01c5365e5e5c0bed2e00
parent5e074131c84a5e52e7d8da01c16d2ac1cf303621
Merge branch 'metadata' into mooseish-types

Conflicts:
lib/Function/Parameters.pm
lib/Function/Parameters.pm