tree f1ccb50dac7fa1458bc354a927b6cbfe26e4ed39
parent e5e6faa3a389b2e1e823ff813456bc3e39a08f0e
parent f515af02c5b591abd06a86c81072a3d9a4fb3f98
author Simon Horman <horms@verge.net.au> 1328151198 +0900
committer Simon Horman <horms@verge.net.au> 1328151198 +0900

Merge branch '3.0/pm-3' into 3.0/snapshot-mackerel-3.3-rc2