From: fincs <fincs.alt1@gmail.com>
Date: Sun, 1 Nov 2015 13:14:01 +0000 (+0100)
Subject: Merge branch 'master' into great-refactor
X-Git-Tag: v1.0.0~56
X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=e4775572c25ec9765e854c54e9feb44f8e742b7e;p=corbenik%2Fctrulib.git

Merge branch 'master' into great-refactor

# Conflicts:
#	libctru/include/3ds/services/httpc.h
---

e4775572c25ec9765e854c54e9feb44f8e742b7e