From 2a244be9ac61ae0adbdc4d0805c0c784a102da4c Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Wed, 28 Mar 2012 06:05:54 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  filer: replace "file as" prompt with combobox opened in fancybox
  filer: info() on item filed
  template: field_combobox

* master: