Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Fri, 2 Mar 2012 15:39:04 +0000 (10:39 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Fri, 2 Mar 2012 15:39:04 +0000 (10:39 -0500)
commit472a019922c6a6e3a55b48f7687c048813484335
tree39a630253ae479f4570c7b77a6899230960f53a9
parent47429a3b582f71d6becdc2f10afaed1a5630566b
parente81e7f7e79710233c0aeac9f8039bf6548cf8013
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  blockem: fix to work with changed 'display_item' hook

* master: