Merge branch 'master' into debug-serialusb.

Chose debug-serialusb version in cases of conflict.

Conflicts:
	libmaple/usb/usb_callbacks.c

1 files changed, 0 insertions, 53 deletions

diff --git a/docs/source/epilog.rst b/docs/source/epilog.rst
index 4234dd9..e64103c 100644
--- a/docs/source/epilog.rst
+++ b/docs/source/epilog.rst
@@ -6,56 +6,3 @@
 .. _forum: http://forums.leaflabs.com
 .. _contact: http://leaflabs.com/contact/
 .. _contact us directly: http://leaflabs.com/contact/
-
-.. Arduino built-in functions
-
-.. _setup(): http://arduino.cc/en/Reference/Setup
-.. _loop():  http://arduino.cc/en/Reference/Loop
-
-.. _pinMode():      http://arduino.cc/en/Reference/PinMode
-.. _digitalWrite(): http://arduino.cc/en/Reference/DigitalWrite
-.. _digitalRead():  http://arduino.cc/en/Reference/DigitalRead
-
-.. _analogReference(): http://arduino.cc/en/Reference/AnalogReference
-.. _analogRead():      http://arduino.cc/en/Reference/AnalogRead
-.. _analogWrite():     http://arduino.cc/en/Reference/AnalogWrite
-
-.. _tone():     http://arduino.cc/en/Reference/Tone
-.. _noTone():   http://arduino.cc/en/Reference/NoTone
-.. _shiftOut(): http://arduino.cc/en/Reference/ShiftOut
-.. _pulseIn():  http://arduino.cc/en/Reference/PulseIn
-
-.. _millis():            http://arduino.cc/en/Reference/Millis
-.. _micros():            http://arduino.cc/en/Reference/Micros
-.. _delay():             http://arduino.cc/en/Reference/Delay
-.. _delayMicroseconds(): http://arduino.cc/en/Reference/DelayMicroseconds
-
-.. _min():       http://arduino.cc/en/Reference/Min
-.. _max():       http://arduino.cc/en/Reference/Max
-.. _abs():       http://arduino.cc/en/Reference/Abs
-.. _constrain(): http://arduino.cc/en/Reference/Constrain
-
-.. _map():  http://arduino.cc/en/Reference/Map
-.. _pow():  http://arduino.cc/en/Reference/Pow
-.. _sqrt(): http://arduino.cc/en/Reference/Sqrt
-
-.. _sin(): http://arduino.cc/en/Reference/Sin
-.. _cos(): http://arduino.cc/en/Reference/Cos
-.. _tan(): http://arduino.cc/en/Reference/Tan
-
-.. _randomSeed(): http://arduino.cc/en/Reference/RandomSeed
-.. _random():     http://arduino.cc/en/Reference/Random
-
-.. _lowByte():  http://arduino.cc/en/Reference/LowByte
-.. _highByte(): http://arduino.cc/en/Reference/HighByte
-.. _bitRead():  http://arduino.cc/en/Reference/BitRead
-.. _bitWrite(): http://arduino.cc/en/Reference/BitWrite
-.. _bitSet():   http://arduino.cc/en/Reference/BitSet
-.. _bitClear(): http://arduino.cc/en/Reference/BitClear
-.. _bit():      http://arduino.cc/en/Reference/Bit
-
-.. _attachInterrupt(): http://arduino.cc/en/Reference/AttachInterrupt
-.. _detachInterrupt(): http://arduino.cc/en/Reference/DetachInterrupt
-
-.. _interrupts():   http://arduino.cc/en/Reference/Interrupts
-.. _noInterrupts(): http://arduino.cc/en/Reference/NoInterrupts