From 7fad65d7af43414d744f4d5d1e75c0f181de9cf8 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 26 Mar 2012 03:38:19 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  add screenshots to diabook

* master: