From 2147ffa48734e50c9df1ea91ce100bf5336eacc2 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 25 Mar 2012 22:47:56 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  typo datarry -> datarray

* master: