From 5a1e2c32fe4a36b1dbbaa6b224c8ced6cb3358c4 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 12 Mar 2012 17:12:01 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  add lightbox, fixex in css
  more save to file backend
  backend for "save to file" feature

* master: