resolved rest conflicts
authorCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Wed, 26 Feb 2014 17:35:56 +0000 (18:35 +0100)
committerCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Wed, 26 Feb 2014 17:35:56 +0000 (18:35 +0100)
commitc78cba16c3004d7b2067408ecdd5fe932b6e4fd0
tree0fb8dae09a05f98b3a189e8e7a919fb86db57b08
parent419ed05f20cf382154c52c3a166679cf401d9eed
parentfaff7d4312753dcd49eab496884bcbf0483f17c7
resolved rest conflicts
rest/__init__.py