Merge branch 'master' of git.uio.no:usit-rt master
authorMarcus Ramberg <marcus.ramberg@gmail.com>
Tue, 16 Dec 2014 14:25:52 +0000 (15:25 +0100)
committerMarcus Ramberg <marcus.ramberg@gmail.com>
Tue, 16 Dec 2014 14:25:52 +0000 (15:25 +0100)
commit153dd67e9c53d1f4bc5da8d98183452c79234e74
treedea1d21d2322ee39503cc13bb1f76c3458d01be5
parenta2b4dbf5f13f6816342d222f39019da1601f87e2
parent8047d69569df8937c51d38b907b664f37eda7646
Merge branch 'master' of git.uio.no:usit-rt